SachaG 2d4889abcc Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel ... # Conflicts: # packages/vulcan-core/lib/modules/default_resolvers.js		2018-09-14 11:10:55 +09:00
..
client	renaming nova-xyz directories to vulcan-xyz	2017-03-24 10:19:24 +09:00
modules	Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel	2018-09-14 11:10:55 +09:00
server	Clean up/refactor settings; add registerSetting and /settings route	2017-09-22 12:24:15 +02:00