]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
Merge branch '2.2'
authorMarkus Goetz <markus@woboq.com>
Wed, 24 Aug 2016 09:39:12 +0000 (11:39 +0200)
committerMarkus Goetz <markus@woboq.com>
Wed, 24 Aug 2016 09:39:12 +0000 (11:39 +0200)
commit6ecda6e7f4ad1e9b8fa112df34d15b7ba3e148c0
tree1e1760659fe63e2d1c4dc51ab773d8999a248ca4
parentb28123bed9c9375a8b0aa1bd414540620c72b58b
parent7362575d64236b8b82263e8a7cd8fe3512b66a5b
Merge branch '2.2'
src/cmd/cmd.cpp
src/gui/application.cpp
src/libsync/discoveryphase.cpp
src/libsync/syncengine.cpp