Joas Schilling c49e7387d6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html

2013-11-26 11:33:17 +01:00

..

acp

[ticket/11994] Fix more language

2013-11-08 01:20:01 +01:00

email

Merge branch 'develop-olympus' into develop

2013-11-19 15:28:37 +01:00

mods

…

app.php

…

captcha_qa.php

…

captcha_recaptcha.php

…

common.php

Merge pull request #1854 from Pico88/ticket/12005

2013-11-21 14:01:23 -08:00

groups.php

…

help_bbcode.php

…

help_faq.php

Merge branch 'develop-olympus' into develop

2013-07-25 14:08:06 +02:00

index.htm

…

install.php

[ticket/11574] Remove install/udpate/new/ fallback from database_update.php

2013-07-30 01:38:06 +02:00

iso.txt

…

mcp.php

[ticket/9657] Fix english language :(

2013-07-11 22:46:34 -04:00

memberlist.php

Merge branch 'develop-olympus' into develop

2013-11-26 11:33:17 +01:00

migrator.php

[ticket/11883] Report completed data step in migration as "Installing Data"

2013-10-02 14:27:46 -05:00

plupload.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

posting.php

[ticket/11894] Fix typo in "Delete post" option

2013-10-05 20:59:07 -07:00

search_ignore_words.php

…

search_synonyms.php

…

search.php

…

ucp.php

[ticket/12005] Remove language vars used by PM popup

2013-11-08 21:57:09 +01:00

viewforum.php

…

viewtopic.php

…