Samuel Elliott d3c3de5a79 Merge remote-tracking branch 'upstream/master' into add-setting-events ... # Conflicts: # client/src/modules/pluginapi.js		2018-02-13 23:07:46 +00:00
..
src	Merge remote-tracking branch 'upstream/master' into add-setting-events	2018-02-13 23:07:46 +00:00
package.json	Move deps to root	2018-01-21 15:41:56 +02:00
webpack.config.js	add error struct	2018-02-07 16:41:10 +02:00