From: masensio Date: Mon, 15 Jun 2015 12:07:49 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic X-Git-Tag: oc-android-1.7.2~1^2~23^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fbfb6dee90f275735c389917d99474d0488bd6d2 Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic Conflicts: .travis.yml src/com/owncloud/android/authentication/AuthenticatorActivity.java --- fbfb6dee90f275735c389917d99474d0488bd6d2 diff --cc .travis.yml index f433b6e5,2f5f171f..b72625c4 --- a/.travis.yml +++ b/.travis.yml @@@ -10,4 -9,4 +10,4 @@@ script - ./setup_env.sh ant - ant clean - ant debug - - ++