Skip to content
Snippets Groups Projects
user avatar
Marcelo Schmidt authored
# Conflicts:
#	i18n/en.i18n.json
#	packages/rocketchat-channel-settings/client/views/channelSettings.coffee
#	packages/rocketchat-channel-settings/client/views/channelSettings.html
#	server/methods/unarchiveRoom.coffee
#	server/startup/roomPublishes.coffee
a78921f1
History
Name Last commit Last update
..
lib
views
README.md
package.js