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
..
csseditor	CSS editor tweaks and fixes	2018-01-22 00:02:19 +00:00
frontend	Implement the main features of the CSS Editor	2018-01-20 22:48:48 -05:00
modules/Example Module	Move example module	2018-02-14 00:17:24 +02:00
plugins	Merge remote-tracking branch 'upstream/master' into add-setting-events	2018-02-13 23:07:46 +00:00
themes/Example	Change test setting text	2018-02-12 04:56:42 +02:00
config.json	Move tests	2018-01-10 22:52:49 +02:00
index.js	WindowUtils and script inject	2018-01-11 00:15:31 +02:00
run.bat	Move tests	2018-01-10 22:52:49 +02:00