Samuel Elliott e94a7c50a4 Merge remote-tracking branch 'upstream/master' into settings ... # Conflicts: # client/src/modules/thememanager.js # client/src/ui/components/BdSettings.vue		2018-03-02 19:47:29 +00:00
..
src	Merge remote-tracking branch 'upstream/master' into settings	2018-03-02 19:47:29 +00:00
package.json	Move deps to root	2018-01-21 15:41:56 +02:00
webpack.config.js	Add support for file settings in themes	2018-02-21 01:16:41 +00:00