From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 9 Nov 2015 09:53:14 +0000 (+0100)
Subject: Merge branch 'beta' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~19^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/038eab1cf77d798df2dd53d544a0e13713beff47?hp=b6ad1b862cc960837467274b5096d0d7aefe54ea

Merge branch 'beta' of https://github.com/owncloud/android into beta
---

diff --git a/.travis.yml b/.travis.yml
index 0db9b1ec..1d648630 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ before_install:
   - rm pom.xml
 script:
   - ./setup_env.sh ant
-  - ant clean
-  - ant debug
+  - ant clean -Djava.source=7 -Djava.target=7
+  - ant debug -Djava.source=7 -Djava.target=7