Merge remote-tracking branch 'origin/2.3'
authorChristian Kamm <mail@ckamm.de>
Thu, 22 Jun 2017 12:06:31 +0000 (14:06 +0200)
committerChristian Kamm <mail@ckamm.de>
Thu, 22 Jun 2017 12:06:31 +0000 (14:06 +0200)
commit15ee7b39ac317c4afaee4752ebb2767745870366
tree6feac8de278eb7405d4b4a11f6ce10405f7ed891
parentcb7d74a063ad7afeff1b7c7333b068996f50d9ef
parent6a298d180dfc96c3407cd9051f3afb2e9d70d6bf
Merge remote-tracking branch 'origin/2.3'
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/folderman.cpp
src/gui/folderwatcher_linux.cpp
src/gui/ignorelisteditor.cpp
src/libsync/syncjournaldb.cpp
src/libsync/syncjournaldb.h