Andreas Fischer b78ae290e8 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-01-30 13:14:33 +01:00

..

convertors

Merge branch 'develop-ascraeus' into develop

2015-01-30 13:14:33 +01:00

data

…

schemas

[prep-release-3.1.3] Update version to 3.1.2-RC1

2015-01-26 19:42:06 +01:00

database_update.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

index.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

install_convert.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

install_install.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

install_main.php

…

install_update.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

phpinfo.php

…