Elias Steurer ffd26f3deb Merge remote-tracking branch 'origin/master' into 174-add-godot-wallpaper-support ... # Conflicts: # .gitignore # .gitlab/ci/base_jobs.yml # .vscode/extensions.json # .vscode/launch.json # CMakePresets.json # ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/WaitingForScreenplay.qml # Tools/setup.py		2023-10-29 13:31:19 +01:00
..
ci	Merge remote-tracking branch 'origin/master' into 174-add-godot-wallpaper-support	2023-10-29 13:31:19 +01:00
issue_templates	Add MergeRequest.md template	2021-01-14 12:54:04 +01:00
media	Change icon sizes	2021-11-04 16:32:40 +01:00
merge_request_templates	Add MergeRequest.md template	2021-01-14 12:54:04 +01:00