Skip to content
Commit fbc3d970 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

Merge remote-tracking branch 'upstream/develop' into fileCount 

Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
parents 635394f2 8d3a956c
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