Merge branch 'linux' of https://github.com/q4a/xray-16 into linux

q4a · q4a · commit 46dc5e1bb08c · 2018-05-29T07:49:53.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ addons:
     - g++-7
 branches:
   only:
+  - linux
   - xd_dev
   - "/^v\\d+\\./"
 notifications:
