Merge branch 'master' into linux

2017-12-14 20:50:55 -06:00
parent aaf281351d 75e455e39e
commit 7eab6f859a
1 changed files with 2 additions and 2 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,8 +8,8 @@ version: 1.0.{build}-{branch}
 # branches to build
 branches:
  # whitelist
-  only:
+  # only:
-    - master
+  #   - master
  # blacklist
  except: