Merge branch 'share-personal-note' of https://github.com/owncloud/cor… · owncloud/core@c14a18f · GitHub

Commit

Merge branch 'share-personal-note' of https://github.com/owncloud/core …

Browse files

…into share-personal-note

# Conflicts:
#	core/ajax/share.php

Loading branch information

felixheidecke committed Jan 15, 2018

2 parents da9f0b9 + 22ef523 commit c14a18f