From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 18 Apr 2016 20:13:48 +0000 (+0200)
Subject: Merge pull request #1942 from wallabag/optimize-import
X-Git-Tag: 2.0.2~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ca8d61b95879314e25aa87c11b5bbfd0df7adb91;hp=23d24b17509ed3e8725bc911a8a2f8fe502e38f2;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1942 from wallabag/optimize-import

Optimize import
---

diff --git a/.travis.yml b/.travis.yml
index 324b236a..d397c872 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,7 @@ matrix:
 # exclude v1 branches
 branches:
     except:
-        - master
-        - dev
+        - legacy
 
 before_script:
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;