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

Merge branch 'bug_hunting' into feature_previews 

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
parents 77ddd1cc 97ae9007
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