Marc Alexander c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/config/services.yml

2013-02-07 00:07:59 +01:00

..

acp

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

email

Merge PR #624 branch 'develop-olympus' into develop

2012-10-16 21:21:03 -04:00

mods

[feature/sphinx-fulltext-search] integrate sphinx language keys with core

2012-07-12 17:31:49 +05:30

app.php

[feature/controller] Remove unused language strings

2012-11-18 15:51:32 -05:00

captcha_qa.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

captcha_recaptcha.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

common.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

2013-02-07 00:07:59 +01:00

groups.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

help_bbcode.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

help_faq.php

[ticket/10771] changed value in help_faq.php

2012-12-02 14:51:28 +05:30

index.htm

…

install.php

[ticket/11259] Make phpbb_admin_path available everywhere

2012-12-09 17:01:08 -06:00

iso.txt

#10549

2007-05-13 22:20:30 +00:00

mcp.php

[ticket/10797] language key rank moved to common

2012-04-20 04:30:42 +05:30

memberlist.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

posting.php

Merge branch 'develop-olympus' into develop

2013-02-03 14:51:52 +01:00

search_ignore_words.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

search_synonyms.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

search.php

[ticket/11032] fix language of error displayed

2012-08-15 22:57:02 +05:30

ucp.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

viewforum.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

viewtopic.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00