Anders 8987db9d31 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	skolehjem/resources/views/admin/washing-reservations/index.blade.php

2020-06-29 08:19:55 +02:00

..

js

Fixes

2020-06-29 08:13:53 +02:00

lang/en

Initial Commit

2020-06-08 10:04:45 +02:00

sass

Finished calendar.js (for now)

2020-06-26 13:07:57 +02:00

views

Merge remote-tracking branch 'origin/master'

2020-06-29 08:19:55 +02:00