Samuel Elliott 0af22b21d4 Merge remote-tracking branch 'upstream/master' into add-generic-settings-modal ... # Conflicts: # client/src/modules/plugin.js # tests/plugins/Example/config.json		2018-02-14 15:40:22 +00:00
..
Depend Error Test	add a depend error test plugin	2018-02-14 09:42:29 +02:00
Example	Merge remote-tracking branch 'upstream/master' into add-generic-settings-modal	2018-02-14 15:40:22 +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