Nathan Guse 3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/includes/functions.php

2012-10-18 18:23:22 -05:00

..

acp

Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103

2012-10-09 22:03:18 -05:00

email

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-16 23:33:57 -05:00

mods

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

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

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

[ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link

2012-10-16 16:47:18 -05: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

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00

index.htm

…

install.php

Merge PR #753 branch 'Senky/ticket/10161' into develop

2012-04-26 22:57:30 -04: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

Merge PR #753 branch 'Senky/ticket/10161' into develop

2012-04-26 22:57:30 -04:00

posting.php

Merge branch 'develop-olympus' into develop

2012-03-31 19:29:56 +02: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

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-18 18:23:22 -05: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