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

..

template

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

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

theme

[ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof

2012-10-18 19:20:54 -05:00

style.cfg

…