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)
commit4d175ae77b2e866e2e438f9e3fbfc67a850e29d0
tree8ea902acb5fa73eada1c6acb65a9ff122246a2ed
parent68057c1c5a6526a9abfe906c3a621627682b197f
parent78df3a35b4e363ac73212f1245620541cb1c60c0
Merge pull request #4247 from owncloud/desktopshare

added desktop sharing