Klaas Freitag bcff1ced5e Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folderman.cpp src/gui/wizard/owncloudadvancedsetuppage.cpp src/libsync/account.cpp		2014-08-29 20:40:33 +02:00
..
modules	Merge branch '1.7'	2014-08-29 20:40:33 +02:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00