Merge remote-tracking branch 'origin/master'
# Conflicts:
#	api/event.php
#	index.html
commit e2e7b4bb22981f4e031419ee0ad2b3a1f54aab16
2 parents 49d04a6 + 68198df
@Vinzenz Rosenkranz Vinzenz Rosenkranz authored on 18 Apr 2020
Showing 7 changed files
View
README.md
View
css/bootstrap.min.css 0 → 100644
View
css/style.css 0 → 100644
View
icon.png 0 → 100644
View
js/bootstrap.min.js 0 → 100644
View
js/jquery-3.5.0.min.js 0 → 100644
View
js/vue.js 0 → 100644