Elias Steurer 6b653bdfdc Merge branch 'master' into qt6-support ... # Conflicts: # .gitlab-ci.yml # CMakeLists.txt # ScreenPlay/CMakeLists.txt # ScreenPlay/qml/Workshop/Workshop.qml # ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml # ScreenPlay/translations/ScreenPlay_.ts # ScreenPlay/translations/ScreenPlay_de.ts # ScreenPlay/translations/ScreenPlay_es.ts # ScreenPlay/translations/ScreenPlay_fr.ts # ScreenPlay/translations/ScreenPlay_ko.ts # ScreenPlay/translations/ScreenPlay_pt_br.ts # ScreenPlay/translations/ScreenPlay_ru.ts # ScreenPlay/translations/ScreenPlay_vi.qm # ScreenPlay/translations/ScreenPlay_vi.ts # ScreenPlay/translations/ScreenPlay_zh_cn.ts		2021-09-26 17:56:40 +02:00
..
src	Refactor workshop plugin to show forum when not installed	2021-09-23 15:55:40 +02:00
SteamSDK	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
CMakeLists.txt	Merge branch 'master' into qt6-support	2021-09-26 17:56:40 +02:00
qmldir	Make ScreenPlayWorkshop open source	2021-07-16 11:14:21 +02:00
steam_appid.txt	Make ScreenPlayWorkshop open source	2021-07-16 11:14:21 +02:00