]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cc6346 6b2282b)
Merge branch 'Kawohl-master'
authorJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 10:01:52 +0000 (11:01 +0100)
committerJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 10:01:52 +0000 (11:01 +0100)
fix conflict


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.