victor 03c1562f5b Merge remote-tracking branch 'origin/master' into master ... # Conflicts: # skolehjem/resources/views/app/news/index.blade.php		2020-11-23 12:28:28 +01:00
..
admin	v1.4.8i Fix border on the X, and added substr	2020-10-30 14:18:28 +01:00
app	Merge remote-tracking branch 'origin/master' into master	2020-11-23 12:28:28 +01:00
errors	v0.10.17a - Various fixes	2020-08-31 11:56:05 +02:00
pdf	v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs	2020-08-20 14:59:22 +02:00
user/layout	Update base.blade.php	2020-08-21 13:41:06 +02:00