Merge branch 'master' of https://intra.acdp.at/gogs/bscheibel/ui

# Conflicts:
#	app/templates/index.html
#	app/views.py

.gitignore

@@ -1 +1 @@
-app/static/isos/
+

gitignore

@@ -1 +0,0 @@
-app/static/isos/