projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d7fde5 726be08)
Merge branch '2.0.2' into 2.0
authorKlaas Freitag <freitag@owncloud.com>
Thu, 29 Oct 2015 14:44:56 +0000 (15:44 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Thu, 29 Oct 2015 14:44:56 +0000 (15:44 +0100)
Conflicts:
ChangeLog


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