Samuel Elliott 755d870a10 Merge remote-tracking branch 'upstream/settings' into collection-settings ... # Conflicts: # client/src/structs/settings/types/collection.js # client/src/ui/components/bd/setting/Collection.vue		2018-08-09 18:27:06 +01:00
..
src	Merge remote-tracking branch 'upstream/settings' into collection-settings	2018-08-09 18:27:06 +01:00
package.json	Update repository URL	2018-03-22 17:13:47 +00:00
webpack.config.js	Fix request module not found	2018-07-21 23:10:33 +01:00
webpack.production.config.js	Fix request module not found	2018-07-21 23:10:33 +01:00