]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Merge remote-tracking branch 'origin/2.2' into master
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 21 Oct 2016 08:27:33 +0000 (10:27 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 21 Oct 2016 08:27:33 +0000 (10:27 +0200)

Trivial merge