Commit 72996373 authored by Tobias Reich's avatar Tobias Reich
Browse files

Merge branch 'master' into uploader

Conflicts:
	assets/min/main.css
parents 7816892f a60e3272
......@@ -24,6 +24,7 @@
z-index: 2;
}
#loading.error {
background-color: #2f0d0e;
background-image: linear-gradient(to right, #451317 0%, #451317 47%, #AA3039 53%, #AA3039 100%);
z-index: 1;
}
......
This diff is collapsed.
Markdown is supported
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