]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
authorJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 09:56:29 +0000 (10:56 +0100)
committerJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 09:56:29 +0000 (10:56 +0100)
commit42aed56a5a92a32b86e2bdd1c6e9d75e27728c8b
tree86481b53f474a5116bf40e30c70b9f86e4e16d13
parent6cc63462b35a4f4eb0d05a9955d8ec243f73f05c
parentca9ec4625391ae23940b3a62aaa0afe89f3d98e8
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
fix conflict
doc/building.rst