Merge remote-tracking branch 'origin/575-theme-add-a-modern-clean-switch-like-theme-as-an-official-theme-in-es-de-to-choose-from' into 575-theme-add-a-modern-clean-switch-like-theme-as-an-official-theme-in-es-de-to-choose-from

Browse source

# Conflicts:
#	es-core/src/components/BadgesComponent.cpp
#	es-core/src/components/BadgesComponent.h
#	es-core/src/components/ImageComponent.cpp
#	es-core/src/resources/TextureResource.cpp
#	es-core/src/resources/TextureResource.h
#	themes/modern-DE/assets/altemu.svg
#	themes/modern-DE/assets/broken.svg
#	themes/modern-DE/assets/completed.svg
#	themes/modern-DE/assets/favorite.svg
#	themes/modern-DE/assets/kidgame.svg

...

This commit is contained in:

Sophia Hadash 2021-09-27 01:34:38 +02:00

parent 7a7b2b3b6e 90d58953ec

commit 61434c66b8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available