Skip to content
Snippets Groups Projects
Unverified Commit 6e8ffe66 authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge branch 'move-slash-me' into develop

# Conflicts:
#	.meteor/packages
parents e4d4ad2b 6274a48d
No related branches found
No related tags found
No related merge requests found
......@@ -63,7 +63,6 @@ rocketchat:livechat
rocketchat:logger
rocketchat:mailer
rocketchat:markdown
rocketchat:me
rocketchat:mentions
rocketchat:mentions-flextab
rocketchat:message-attachments
......@@ -79,6 +78,7 @@ rocketchat:slashcommands-invite
rocketchat:slashcommands-join
rocketchat:slashcommands-kick
rocketchat:slashcommands-leave
rocketchat:slashcommands-me
rocketchat:slashcommands-mute
rocketchat:slashcommands-topic
rocketchat:spotify
......
......@@ -160,7 +160,6 @@ rocketchat:livechat@0.0.1
rocketchat:logger@0.0.1
rocketchat:mailer@0.0.1
rocketchat:markdown@0.0.1
rocketchat:me@0.0.1
rocketchat:mentions@0.0.1
rocketchat:mentions-flextab@0.0.1
rocketchat:message-attachments@0.0.1
......@@ -177,6 +176,7 @@ rocketchat:slashcommands-invite@0.0.1
rocketchat:slashcommands-join@0.0.1
rocketchat:slashcommands-kick@0.0.1
rocketchat:slashcommands-leave@0.0.1
rocketchat:slashcommands-me@0.0.1
rocketchat:slashcommands-mute@0.0.1
rocketchat:slashcommands-topic@0.0.1
rocketchat:sms@0.0.1
......
Package.describe({
name: 'rocketchat:me',
name: 'rocketchat:slashcommands-me',
version: '0.0.1',
summary: 'Message pre-processor that will translate /me commands',
git: ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment