diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
| commit | f42a737419e41640af33ee0e2c52e7956c56e72e (patch) | |
| tree | c58989a51cd189b25a34217b7dd61caaadc19e93 /travis | |
| parent | 713fe496ce0d18c321492c27a8e0301f02ddcf52 (diff) | |
| parent | 005c27e73d2cd8b6e60eaf09ebc670ce8693f3b4 (diff) | |
| download | forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.gz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.bz2 forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.xz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'travis')
0 files changed, 0 insertions, 0 deletions