Joas Schilling b566686b51 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php

2015-01-20 23:32:36 +01:00

..

data.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

dispatcher_interface.php

[ticket/13489] Disable the event dispatcher in the migrator

2015-01-14 11:09:44 +01:00

dispatcher.php

[ticket/13489] Disable the event dispatcher in the migrator

2015-01-14 11:09:44 +01:00

kernel_exception_subscriber.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

kernel_terminate_subscriber.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

md_exporter.php

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

php_exporter.php

[ticket/13124] Also trim spaces in front of comments except for first line

2014-10-06 16:09:56 +02:00

recursive_event_filter_iterator.php

[ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman

2014-06-16 22:35:39 +02:00