SachaG 2b61d31ccb Merge branch 'master' into devel ... # Conflicts: # packages/vulcan-users/lib/server/on_create_user.js		2018-06-16 10:16:09 +09:00
..
client	Clean up vulcan:users package directory structure	2018-02-17 11:17:07 +09:00
modules	Update permissions	2018-06-14 17:45:02 +09:00
server	Merge branch 'master' into devel	2018-06-16 10:16:09 +09:00