diff options
author | Andreas Fischer <bantu@phpbb.com> | 2012-05-11 15:47:46 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-11 15:47:46 +0200 |
commit | 1fd2795cf04901e6cefb6e6f90effaeb194b4837 (patch) | |
tree | 31b6145e8d14f5ec165fb8edb849a8743b54db01 /phpBB/includes/startup.php | |
parent | f0a4840cccb848a9f3dff0d946a201564a3b2da1 (diff) | |
parent | 8861e26034beb9367d1f1fd006ea83852951c6f6 (diff) | |
download | forums-1fd2795cf04901e6cefb6e6f90effaeb194b4837.tar forums-1fd2795cf04901e6cefb6e6f90effaeb194b4837.tar.gz forums-1fd2795cf04901e6cefb6e6f90effaeb194b4837.tar.bz2 forums-1fd2795cf04901e6cefb6e6f90effaeb194b4837.tar.xz forums-1fd2795cf04901e6cefb6e6f90effaeb194b4837.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10492] Skip functional tests on PHP 5.2 on travis
Diffstat (limited to 'phpBB/includes/startup.php')
0 files changed, 0 insertions, 0 deletions