packages/rocketchat-lib/server/models/Users.coffee · 8b9c1342f110222b883bcde0e2bc161c1842c63e · RocketChat / Rocket.Chat

9 years ago

Merge branch 'develop' into admin-add-user · e43d5ef1

Marcelo Schmidt authored 9 years ago

Conflicts:
	packages/rocketchat-lib/package.js
	packages/rocketchat-lib/server/methods/updateUser.coffee
	packages/rocketchat-ui-admin/admin/users/adminUserEdit.coffee

e43d5ef1

History

Merge branch 'develop' into admin-add-user

Marcelo Schmidt authored 9 years ago

Conflicts:
	packages/rocketchat-lib/package.js
	packages/rocketchat-lib/server/methods/updateUser.coffee
	packages/rocketchat-ui-admin/admin/users/adminUserEdit.coffee