]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
authorJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 09:59:18 +0000 (10:59 +0100)
committerJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 09:59:18 +0000 (10:59 +0100)
commit6b2282bf0d2b2eada32822e1d2a10d123a4cceaf
treea7d511ca7d7ebf2b342615057f10846f04c1b8e8
parent42aed56a5a92a32b86e2bdd1c6e9d75e27728c8b
parentcc91c42dfadef607ff24d8919152716602114349
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
fix conflict