1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Joas Schilling 8663edce76 Merge branch '3.1.x' into 3.2.x
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2016-02-13 18:08:01 +01:00
..
2016-01-06 13:26:23 +01:00
2016-02-13 18:08:01 +01:00
2015-12-15 19:55:55 +01:00
2015-10-17 23:05:57 +02:00
2015-10-17 23:05:57 +02:00
2016-01-15 11:18:13 +01:00
2015-10-21 00:32:20 +02:00
2015-10-14 08:38:32 +02:00
2015-10-17 23:05:57 +02:00
2016-02-11 22:18:09 +01:00
2015-10-11 10:48:53 +02:00
2016-02-13 18:08:01 +01:00