diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-09 16:11:44 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-09 16:11:44 +0200 |
| commit | 73bd77809ed0acfb19b9124f08d5ec044a911299 (patch) | |
| tree | a2bf836da21fe45e424dbc0dd26cdd2e5963eb69 | |
| parent | 1f7ada8e3dddf500c52e6b3883499a7ab7ff1240 (diff) | |
| parent | 02801dee7c92d80705f64f3a1773cd39bc41a682 (diff) | |
| download | forums-73bd77809ed0acfb19b9124f08d5ec044a911299.tar forums-73bd77809ed0acfb19b9124f08d5ec044a911299.tar.gz forums-73bd77809ed0acfb19b9124f08d5ec044a911299.tar.bz2 forums-73bd77809ed0acfb19b9124f08d5ec044a911299.tar.xz forums-73bd77809ed0acfb19b9124f08d5ec044a911299.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12693] Don't try to check the composer.phar file
| -rwxr-xr-x | travis/check-executable-files.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 1d8b33d327..4d420add1c 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -27,7 +27,7 @@ then files_skipped="-false" # Files which have to be executable - executable_files="-path ${path}bin/* -o -path ${root}composer.phar" + executable_files="-path ${path}bin/*" incorrect_files=$( \ find ${path} \ |