Nathan Guse 0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html

2012-12-07 21:14:39 -06:00

..

acp

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

2012-12-07 21:14:39 -06:00

email

[ticket/11103] Move all email templates to the email/ directory & prep short

2012-11-11 11:37:14 -06:00

mods

…

app.php

[feature/controller] Remove unused language strings

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

captcha_qa.php

…

captcha_recaptcha.php

…

common.php

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

2012-12-07 21:14:39 -06:00

groups.php

…

help_bbcode.php

…

help_faq.php

[ticket/10771] changed value in help_faq.php

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

index.htm

…

install.php

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05:00

iso.txt

…

mcp.php

…

memberlist.php

…

posting.php

…

search_ignore_words.php

…

search_synonyms.php

…

search.php

…

ucp.php

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

2012-12-07 21:14:39 -06:00

viewforum.php

…

viewtopic.php

…