Merge branch 'develop' into share_link_show_shared_files
authormasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 17:23:33 +0000 (18:23 +0100)
committermasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 17:23:33 +0000 (18:23 +0100)
commit45c1e47e5fcc4ed0a55601725813810982746109
treed8a05ff355f16b2972f02ed886b6bf5abfb072e9
parentab3044dc821afd86a99a49ce30b9160e5f25e347
parentadb0782aecdb79a84fd49a677ffd7e2b6c20d757
Merge branch 'develop' into share_link_show_shared_files
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java