Skip to content
Snippets Groups Projects
Commit 94ce8f21 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge branch 'master' into share_api 

Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
parents 26992254 dfae77de
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 491 additions and 53 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment