Skip to content
Snippets Groups Projects
Commit 0cfacee4 authored by FC Gudder's avatar FC Gudder
Browse files

Merge branch 'pregmod-master' into 'custom-image-fixes' 

# Conflicts:
#   src/gui/css/mainStyleSheet.tw
parents 51a5d363 2fe49f4c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/gui/css/mainStyleSheet.tw
+ 1
− 1
View file @ 0cfacee4
......@@ -135,4 +135,4 @@ object {
.springgreen { color: springgreen }
.tan { color: tan }
.yellow { color: yellow }
.yellowgreen { color: yellowgreen }
.yellowgreen { color: yellowgreen }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment