|
Joas Schilling
|
7ccb19fa001cb0f76499fd19256e60df382c6d2a
7ccb19fa001cb0f76499fd19256e60df382c6d2a |
Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql |
|
|
Joas Schilling
|
8f5d76111243fae8d2926037e8fef0cbc97802c7
8f5d76111243fae8d2926037e8fef0cbc97802c7 |
[prep-release-3.1.5] Add migration for 3.1.5 |
|
|
Joas Schilling
|
38a1442d400d183549ee6febe11de956e96bc6db
38a1442d400d183549ee6febe11de956e96bc6db |
[prep-release-3.1.5] Update version for final 3.1.5 release |
|
|
Joas Schilling
|
f688bc6160b6b6abf520dd538568441f7e84d390
f688bc6160b6b6abf520dd538568441f7e84d390 |
Merge branch 'ticket/13938' into prep-release-3.1.5 |
|
|
cyberalien <cyberalien@gmail.com>
|
e6407907e289f4f0a6e141eeebfe02c60110904c
e6407907e289f4f0a6e141eeebfe02c60110904c |
[ticket/13938] Fix inconsistencies between <link> tags
PHPBB3-13938 |
|