Dan Brown 3286f29a61 Merge branch 'master' into 2019-design		2019-02-09 14:58:38 +00:00
..
icons	Started the migration of the setting views	2019-02-02 15:49:57 +00:00
js	Merge branch 'master' into 2019-design	2019-02-09 14:58:38 +00:00
sass	Merge branch 'master' into 2019-design	2019-02-09 14:58:38 +00:00