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
..
Example	Add internal settings access to the plugin API	2018-02-13 22:37:24 +00:00
Example 2	add types and module config	2018-02-13 17:54:53 +02:00
Example 3	Rename require to bridge	2018-02-13 18:43:44 +02:00