frederikpyt e06504b5fb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master ...

 Conflicts:

	skolehjem/resources/lang/dk/msg.php

	skolehjem/resources/lang/en/msg.php

2020-08-12 13:10:37 +02:00

..

js

Fixes

2020-07-28 15:13:33 +02:00

lang

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

2020-08-12 13:10:37 +02:00

sass

v0.8.5 - Fixed lang and css

2020-08-12 13:09:47 +02:00

views

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

2020-08-12 13:10:37 +02:00