Merge branch 'develop' into share_link_show_shared_files
authormasensio <masensio@solidgear.es>
Mon, 27 Jan 2014 13:00:07 +0000 (14:00 +0100)
committermasensio <masensio@solidgear.es>
Mon, 27 Jan 2014 13:00:07 +0000 (14:00 +0100)
commit388fdd2265b24b78808d1e51a994cc543d2a43c8
tree9ca1360cdfc58a453320a047de186a9fb3cc045f
parent81b3597853847eddbe4e74eec921086244839649
parent5ca133c5e4d0d32b491dafe3d8142a41adefc4cf
Merge branch 'develop' into share_link_show_shared_files
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCShare.java
src/com/owncloud/android/operations/GetSharedFilesOperation.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java