Nathaniel Guse 213bc09743 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data ... Conflicts: phpBB/install/database_update.php		2013-02-23 15:05:47 -06:00
..
data	Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data	2013-02-23 15:05:47 -06:00
tool	[feature/migrations] Add language strings for migrations errors	2013-02-09 20:56:42 -06:00
exception.php	[feature/migrations] getLocalisedMessage function for migration exception	2013-02-15 22:19:24 -06:00
migration.php	[ticket/9737] Fix some comments	2013-01-23 09:45:20 -06:00