mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-20 12:52:06 +03:00
4fc044d368
Conflicts: cmake/modules/NSIS.template.in src/CMakeLists.txt src/creds/shibboleth/authenticationdialog.cpp src/creds/shibboleth/authenticationdialog.h src/gui/owncloudgui.cpp src/libsync/creds/shibboleth/authenticationdialog.cpp src/libsync/creds/shibboleth/authenticationdialog.h src/libsync/mirallaccessmanager.cpp src/mirall/authenticationdialog.cpp src/mirall/authenticationdialog.h |
||
---|---|---|
.. | ||
abstractcredswizardpage.cpp | ||
abstractcredswizardpage.h | ||
owncloudadvancedsetuppage.cpp | ||
owncloudadvancedsetuppage.h | ||
owncloudadvancedsetuppage.ui | ||
owncloudhttpcredspage.cpp | ||
owncloudhttpcredspage.h | ||
owncloudhttpcredspage.ui | ||
owncloudsetupnocredspage.ui | ||
owncloudsetuppage.cpp | ||
owncloudsetuppage.h | ||
owncloudshibbolethcredspage.cpp | ||
owncloudshibbolethcredspage.h | ||
owncloudwizard.cpp | ||
owncloudwizard.h | ||
owncloudwizardcommon.cpp | ||
owncloudwizardcommon.h | ||
owncloudwizardresultpage.cpp | ||
owncloudwizardresultpage.h | ||
owncloudwizardresultpage.ui |