HISTORY.md · 6519c20ed7ac92fa8fe28f0af7eec61ee86082a7 · RocketChat / Rocket.Chat · GitLab

Snippets Groups Projects

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

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

To find the state of this project's repository at the time of any of these versions, check out the tags.