Merge pull request #1307 from owncloud/share_with_password_and_expiration_time
authorDavid A. Velasco <dvelasco@owncloud.com>
Wed, 25 Nov 2015 08:36:48 +0000 (09:36 +0100)
committerDavid A. Velasco <dvelasco@owncloud.com>
Wed, 25 Nov 2015 08:36:48 +0000 (09:36 +0100)
Share via link with password and expiration time


Trivial merge