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

..

about

v0.8.4b - Made about pages

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

contacts

v0.7.7 - Various fixes

2020-08-11 18:21:51 +02:00

events

v0.8.3 - Added uploade images function

2020-08-12 12:28:05 +02:00

feedbacks

v0.6.2a - Fixed css

2020-08-11 10:16:07 +02:00

guides

v0.8.4a - Added last support for images uploade

2020-08-12 12:49:05 +02:00

layout

v0.8.4b - Made about pages

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

menuplans

v0.7.7 - Various fixes

2020-08-11 18:21:51 +02:00

news

v0.8.3 - Added uploade images function

2020-08-12 12:28:05 +02:00

root

v0.5.5B - Change app home page to news page

2020-08-06 14:30:18 +02:00

settings

v0.7.7 - Various fixes

2020-08-11 18:21:51 +02:00

users

v0.8.5 - Fixed lang and css

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

vagttelefons

v0.7.7 - Various fixes

2020-08-11 18:21:51 +02:00

washing-reservations

v0.7.7 - Various fixes

2020-08-11 18:21:51 +02:00