makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/styles
History
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
..
prosilver Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00
subsilver2 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00