projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f26bb6 970cdcf)
Merge remote-tracking branch 'origin/2.1'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 4 Jan 2016 11:38:17 +0000 (12:38 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 4 Jan 2016 11:38:59 +0000 (12:38 +0100)
 Conflicts:
VERSION.cmake


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