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-04 03:38:28 +01:00
2016-01-06 13:26:23 +01:00
2016-01-26 22:13:26 +01:00
2016-01-06 13:52:11 +01:00
2016-01-28 12:17:35 -08:00
2016-01-15 11:22:13 +01:00
2016-02-13 18:08:01 +01:00
2015-12-15 19:55:55 +01:00
2016-01-26 22:13:26 +01:00
2016-01-28 12:17:35 -08:00
2016-02-08 13:26:19 +01:00
2016-02-07 16:19:23 +01:00
2016-01-26 23:45:51 +01:00
2016-01-15 11:18:13 +01:00
2016-01-06 13:51:19 +01:00
2016-01-06 13:52:11 +01:00
2016-01-06 13:52:11 +01:00
2016-02-02 17:13:47 +01:00
2016-01-13 12:55:31 +01:00
2016-01-06 13:52:11 +01:00
2016-01-09 15:42:42 +01:00
2016-01-10 19:33:45 +01:00
2016-02-11 22:18:09 +01:00
2016-02-13 18:08:01 +01:00
2016-01-06 13:52:11 +01:00