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
..
js	v0.10.16 - Various fixes	2020-08-31 09:36:10 +02:00
lang	v1.4.7 Add favicon	2020-10-15 11:14:29 +02:00
sass	v1.3.2 - Fixed table css and removed pagination in backend	2020-09-21 08:32:05 +02:00
views	Merge remote-tracking branch 'origin/master' into master	2020-11-23 12:28:28 +01:00