Elias Steurer c74e80f00a Merge remote-tracking branch 'origin/master' ... # Conflicts: # ScreenPlayWallpaper/qml/Wallpaper.qml		2021-11-13 14:30:02 +01:00
..
GifWallpaper.qml	Remove more deprecated version import	2021-10-08 10:14:11 +02:00
MultimediaView.qml	Fix windows detection	2021-11-11 18:08:24 +01:00
MultimediaWebView.qml	Add index.html copy step to macos version	2021-11-01 19:02:39 +01:00
Test.qml	Remove versioned qml imports #2	2021-09-10 12:45:15 +02:00
Wallpaper.qml	Merge remote-tracking branch 'origin/master'	2021-11-13 14:30:02 +01:00
WebsiteWallpaper.qml	Fix HTML Wallpaper	2021-11-12 14:56:22 +01:00