|
Marc
|
cd0ffc5de61c3ec437c07b734aa1373f6c2dbb70
cd0ffc5de61c3ec437c07b734aa1373f6c2dbb70 |
Merge branch '3.1.x' into 3.2.x
Conflicts:
.travis.yml |
|
|
Marc
|
a36f96aefad215832a6a47d034bcf3e72abd20b5
m a36f96aefad215832a6a47d034bcf3e72abd20b5 |
Merge pull request #4415 from Elsensee/ticket/14743
[ticket/14743] Remove PHP7 from travis tests in 3.1.x |
|
|
Oliver Schramm <oliver.schramm97@gmail.com>
|
bb11294b96b964fa309ab198475e37d41d5494a0
m bb11294b96b964fa309ab198475e37d41d5494a0 |
[ticket/14743] Remove PHP7 from travis tests
PHPBB3-14743 |
|