Andreas Fischer 37b28ca7e7 Merge branch 'develop-olympus' into develop ... * develop-olympus: [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. Conflicts: build/build.xml phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg		2013-07-12 21:34:15 +02:00
..
data	Merge branch 'develop-olympus' into develop	2013-07-12 21:34:15 +02:00
tool	Merge remote-tracking branch 'EXreaction/ticket/11387' into develop	2013-05-31 17:21:00 +02:00
exception.php	[feature/migrations] getLocalisedMessage function for migration exception	2013-02-15 22:19:24 -06:00
migration.php	[ticket/11662] Typos: occured -> occurred	2013-07-12 17:51:29 +02:00