phpbb/phpBB/adm
Joas Schilling 8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
..
images [ticket/10270] Changing close button for ajax popups 2012-03-31 02:10:16 +02:00
style 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.php [ticket/10607] Added 'Powered by' translation string. 2012-04-04 11:38:15 +08:00
swatch.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00