diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-16 22:47:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-16 22:47:27 +0200 |
| commit | 7f3aebd495ce940fe263484345fa00661cfadd15 (patch) | |
| tree | 148f07295a56dcde516e85d22ea99f2a71719748 /phpBB/includes/diff | |
| parent | b305364b278cb224346a4a98cfdace24b2f3b845 (diff) | |
| parent | d735129d6e143d23c662b43dc2c7adb7b2c801fa (diff) | |
| download | forums-7f3aebd495ce940fe263484345fa00661cfadd15.tar forums-7f3aebd495ce940fe263484345fa00661cfadd15.tar.gz forums-7f3aebd495ce940fe263484345fa00661cfadd15.tar.bz2 forums-7f3aebd495ce940fe263484345fa00661cfadd15.tar.xz forums-7f3aebd495ce940fe263484345fa00661cfadd15.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions