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

 Conflicts:

	skolehjem/app/Http/Controllers/RootController.php

2020-08-31 14:29:24 +02:00

..

js

v0.10.16 - Various fixes

2020-08-31 09:36:10 +02:00

lang

v0.10.15p - Fixed 'msg.telefontid'

2020-08-28 12:54:39 +02:00

sass

v0.10.17a - Various fixes

2020-08-31 11:56:05 +02:00

views

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

2020-08-31 14:29:24 +02:00