Commit Graph

4 Commits

Author SHA1 Message Date
Sebastian Davaris dd5a9fdbc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/js/navmenu/menu.js
2020-06-23 15:34:12 +02:00
Sebastian Davaris 8ac68ef7b9 Added FontAwesome 2020-06-23 15:32:42 +02:00
frederikpyt d5ddc0901c Created Calender 2020-06-23 12:01:27 +02:00
Frederikmillingpytlick e73e2aacdc Added admin sites 2020-06-15 08:56:21 +02:00