Skip to content
Commit b36914df authored by David A. Velasco's avatar David A. Velasco
Browse files

Merge branch 'develop' into file_browsing_refactoring 

Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
parents 2a95f59a fc4819a5
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment