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
..
dk	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-12 13:10:37 +02:00
en	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-12 13:10:37 +02:00