Skip to content
Commit d8d75623 authored by MMMarcy's avatar MMMarcy
Browse files

Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency 

Conflicts:
	owncloud-android-library
	pom.xml
parents 0775b10a 95a02855
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