Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic

author masensio <masensio@solidgear.es>

Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)

committer masensio <masensio@solidgear.es>

Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
author masensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
committer masensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
diff --cc .travis.yml

index f433b6e,2f5f171..b72625c
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -10,4 -9,4 +10,4 @@@ script
     - ./setup_env.sh ant
     - ant clean
     - ant debug
-   
- -
++  
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge
author	masensio <masensio@solidgear.es>
	Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
committer	masensio <masensio@solidgear.es>
	Mon, 15 Jun 2015 12:07:49 +0000 (14:07 +0200)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/authentication/AuthenticatorActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history