nextcloud-desktop/cmake
Klaas Freitag de60d53a78 Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
Conflicts:
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
..
modules Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog 2012-10-02 12:34:06 +02:00