Joas Schilling 2a662c5e07 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/phpbb/user.php

2015-06-14 17:40:18 +02:00

..

data

Merge branch '3.1.x'

2015-06-14 17:40:18 +02:00

tool

Merge branch '3.1.x'

2015-06-09 20:23:29 +02:00

container_aware_migration.php

…

exception.php

…

helper.php

…

migration.php

…

profilefield_base_migration.php

…

schema_generator.php

…