diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
| commit | 1a31f03a7b89e2a88f188e9f68c96469aa40be79 (patch) | |
| tree | 95a2abfa19fa9c8666534404b9ecffe41059f9a3 /phpBB/includes/acp | |
| parent | db9fd30e7c74f5812e38270123656926f02173fa (diff) | |
| parent | c955d0145697fb866aefd1454127218b976009cd (diff) | |
| download | forums-1a31f03.tar forums-1a31f03.tar.gz forums-1a31f03.tar.bz2 forums-1a31f03.tar.xz forums-1a31f03.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12162] Set language to C before running diff to ensure its english
[ticket/11509] Be exact when referencing the branch name.
[ticket/12161] Do not use subdirectories in build/save directory.
[ticket/11509] Run commit message checker only in one environment.
[ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.
Conflicts:
.travis.yml
Diffstat (limited to 'phpBB/includes/acp')
0 files changed, 0 insertions, 0 deletions