Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef768b7d authored by Marcello Steiner's avatar Marcello Steiner Committed by MMMarcy
Browse files

Merge branch 'develop' of github.com:owncloud/android-library into buildsystem/gradle_develop 

Conflicts:
	.travis.yml
parents 04299bdf 2799b3e8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment