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
..
data	Add update hook	2018-02-12 17:54:40 +00:00
modules	Merge remote-tracking branch 'upstream/master' into add-setting-events	2018-02-13 23:07:46 +00:00
plugins	add header	2018-02-07 14:21:51 +02:00
structs	Move error event struct	2018-02-13 22:28:58 +00:00
styles	Tidy modal SCSS files	2018-02-13 17:50:01 +00:00
ui	Move error event struct	2018-02-13 22:28:58 +00:00
index.js	load modules	2018-02-14 00:17:02 +02:00