Skip to content
Snippets Groups Projects
Commit d68daaec authored by Marcelo Schmidt's avatar Marcelo Schmidt
Browse files

Merge branch 'master' into rocket-mailer

* master: (24 commits)
  Add default allowed file upload
  Fix #1381
  add SECURITY.md
  Using official emojione package
  Using official emojione package
  3,000 commits!!
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  try new guest count every loop
  sorting i18n strings
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  use correct settings for livechat app
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  meteor update
  update old build script
  there is no message to update yet
  livechat room publish
  room icons
  added back _colors files
  livechat route
  fixing livechat route
  ...
parents f1998099 61608d2c
No related branches found
No related tags found
No related merge requests found
Showing with 342 additions and 335 deletions
Loading
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