Merge pull request #4247 from owncloud/desktopshare
authorDaniel Molkentin <daniel@molkentin.de>
Thu, 3 Dec 2015 19:19:47 +0000 (20:19 +0100)
committerDaniel Molkentin <daniel@molkentin.de>
Thu, 3 Dec 2015 19:19:47 +0000 (20:19 +0100)
added desktop sharing


Trivial merge