diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 00:32:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 00:32:58 +0200 |
| commit | c0795cc4daae6af400d2a3493277819369c4985a (patch) | |
| tree | d03a7640f1478838df4ede095447eecc8949d9ff /git-tools/merge.php | |
| parent | 90e532430c94efa8bc5120bd81c9a5321c7deacb (diff) | |
| parent | 43538fdca15b9b6cd1d64a7808b4e4a4d2027221 (diff) | |
| download | forums-c0795cc4daae6af400d2a3493277819369c4985a.tar forums-c0795cc4daae6af400d2a3493277819369c4985a.tar.gz forums-c0795cc4daae6af400d2a3493277819369c4985a.tar.bz2 forums-c0795cc4daae6af400d2a3493277819369c4985a.tar.xz forums-c0795cc4daae6af400d2a3493277819369c4985a.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympus
* EXreaction/ticket/11726:
[ticket/11726] Don't run lint tests on Travis on postgres
Diffstat (limited to 'git-tools/merge.php')
0 files changed, 0 insertions, 0 deletions