Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv

# Conflicts: # src/main/java/mops/gruppen2/controller/APIController.java # src/main/resources/templates/create.html
2020-03-18 03:23:22 +01:00
parent 179062eed9 2c3531657d
commit 4b1627a993
5 changed files with 40 additions and 3 deletions
--- a/src/main/resources/templates/create.html
+++ b/src/main/resources/templates/create.html
@ -64,4 +64,4 @@
    </div>
 </main>
 </body>
-</html>
+</html>