Merged
Conversation
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
Gudii
added a commit
to Gudii/Rocket.Chat
that referenced
this pull request
Jul 1, 2016
…nto develop * 'develop' of https://github.com/RocketChat/Rocket.Chat: (210 commits) Save room topic escaped Update references from ES2016 to ECMAScript 2015 REST API Add all users to room (RocketChat#3569) Use .eslintc file instead of .eslintrc.js Update settings.js Restore watermark Add eslint and ES2016 to contributing guide Fix eslint errors Fix Ubuntu link closes 3575 Update more links to current documentation Fixes RocketChat#3571: sort slash commands before filtering Rename settings group Lingohub (RocketChat#3562) Remove unused method User findOneByEmailAddress case insensitive fixes language_version on catalan translation fixes language_version on spanish translation version bump to 0.34.0 Add "How it all started" Fix issue with updateTimeout using rid out of context ... # Conflicts: # packages/rocketchat-theme/assets/stylesheets/base.less # packages/rocketchat-ui-login/login/form.coffee # packages/rocketchat-ui-sidenav/side-nav/sideNav.html
This was referenced Jan 15, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@RocketChat/core
Closes #ISSUE_NUMBER