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

 Conflicts:

	skolehjem/resources/views/admin/events/create.blade.php

2020-08-07 09:49:31 +02:00

..

contacts

v0.5.7 - Add the last support for english

2020-08-06 20:33:46 +02:00

events

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

2020-08-07 09:49:31 +02:00

feedbacks

v0.5.1 - Made contact phone number optional and updated data in seeders.

2020-08-05 13:29:45 +02:00

guides

v0.5.7 - Add the last support for english

2020-08-06 20:33:46 +02:00

layout

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

menuplans

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

news

v0.5.8 - Added create news option on guide and event create/edit

2020-08-07 09:47:23 +02:00

root

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

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

users

Merge pull request #3 from sebathefox/Multi-language

2020-08-07 08:53:29 +02:00

vagttelefons

v0.5.7 - Add the last support for english

2020-08-06 20:33:46 +02:00

washing-reservations

Merge pull request #3 from sebathefox/Multi-language

2020-08-07 08:53:29 +02:00