Merge branch 'develop'

black-trooper · Aug 21, 2019 · 1adb1eb · 1adb1eb
2 parents cada4d6 + 037a427
commit 1adb1eb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,5 @@ deploy:
     tags: true
   api_key:
     secure: cUUR9Ugj2UjJ0lhrPs1T5tjFO4JlThX3p3TaJXNiPZFVzwsaotzrm/Cp0Ib8xLvjdThD64RkjdNQ60/Sdl2Nd6qL6LJnMXdUPTAsXGTBrOSLPZMWwLL0ZdYvoCI0iangxcxMd45v8Dp0ZvDSWD4pQ6YhBNcF1VQ472sH/fBbE/lw9qr0xsyaLvT38iVeO7q2Gi2TXkVCMWiZp8+yw/bm1EmYL8OxizncljFrjCw9kXjJ7p07Cp86HdX2iAh43OQNyrC6tI6Bvd4o7MDL3JEQxScThS+A0Key5gLbcChZiLggbhI+G+hamdKyBtAXWCup0R6eQ+voosaeocupbFdJpR9DFRwt2/WoiY44YSUl8e4syAlJvI+/jN+1RNsG9depHrfY3+J2wY37Km5/4YHthazvoOnoNPcoMDmWs2HfzWfZbdP9KQzEC1jRWtykyFyUJeRuEz+QP89ohtU36Ls6z675+eLmgioI6VKouqQiLwd9VQ5CbNt4IGeuY2dApIvnuI2BQY2DvXULCXtmq7TSrLiHphkVVo3X/xr2ZxZvgE9GmSLgC18grAnFaeSaUSZM9NosTE3Tn742kIohi/t4gUUFwd/gso5n70ltBS2Hry1ViI08iuWSETLqVY9IrW5vAQqb9xObfde2Rkpv8SeQsrYFmIhQu6dlsTGPhuhwV0Q=
-before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+services:
+  - xvfb