Merge branch 'master' into linux

This commit is contained in:
DrChat 2017-12-14 20:50:55 -06:00
commit 7eab6f859a
1 changed files with 2 additions and 2 deletions

View File

@ -8,8 +8,8 @@ version: 1.0.{build}-{branch}
# branches to build # branches to build
branches: branches:
# whitelist # whitelist
only: # only:
- master # - master
# blacklist # blacklist
except: except: