diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index be7df2b5b087..b845c74c74a0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
FROM rocketchat/base:8
-ENV RC_VERSION 0.61.0-develop
+ENV RC_VERSION 0.61.2
MAINTAINER buildmaster@rocket.chat
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 3df6feef4554..e5edaee3498a 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
appVersion = 62, # Increment this for every release.
- appMarketingVersion = (defaultText = "0.61.0-develop"),
+ appMarketingVersion = (defaultText = "0.61.2"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
diff --git a/.travis/snap.sh b/.travis/snap.sh
index e3a8ee703866..157b8d19769a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
- RC_VERSION=0.61.0-develop
+ RC_VERSION=0.61.2
fi
echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index c0e5ce6370f9..b8fb45f406f7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,323 @@
-
-# 0.60.0 (2017-12-27)
+
+## 0.61.2 (2018-02-20)
+
+
+### Bug Fixes
+
+- [#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776) Emoji rendering on last message
+- [#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772) Livechat conversation not receiving messages when start without form
+- [#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750) Livechat issues on external queue and lead capture
+
+
+
+
+## 0.61.1 (2018-02-14)
+
+
+### Bug Fixes
+
+- [#9714](https://github.com/RocketChat/Rocket.Chat/pull/9714) Close Livechat conversation by visitor not working in version 0.61.0
+- [#9639](https://github.com/RocketChat/Rocket.Chat/pull/9639) Desktop notification not showing when avatar came from external storage service
+- [#9640](https://github.com/RocketChat/Rocket.Chat/pull/9640) Facebook integration in livechat not working on version 0.61.0
+- [#9067](https://github.com/RocketChat/Rocket.Chat/pull/9067) Formal pronouns and some small mistakes in German texts
+- [#9716](https://github.com/RocketChat/Rocket.Chat/pull/9716) GitLab OAuth does not work when GitLab’s URL ends with slash
+- [#9720](https://github.com/RocketChat/Rocket.Chat/pull/9720) Messages can't be quoted sometimes
+- [#9626](https://github.com/RocketChat/Rocket.Chat/pull/9626) Missing string 'There_are_no_applications' on the OAuth Apps Page
+- [#9623](https://github.com/RocketChat/Rocket.Chat/pull/9623) Weird rendering of emojis at sidebar when `last message` is activated
+
+
+
+
+# 0.61.0 (2018-01-27)
+
+
+### BREAKING CHANGES
+
+- [#9048](https://github.com/RocketChat/Rocket.Chat/pull/9048) Decouple livechat visitors from regular users
+
+
+### New Features
+
+- [#9366](https://github.com/RocketChat/Rocket.Chat/pull/9366) add /home link to sidenav footer logo
+- [#9107](https://github.com/RocketChat/Rocket.Chat/pull/9107) Add impersonate option for livechat triggers
+- [#9228](https://github.com/RocketChat/Rocket.Chat/pull/9228) Add mention-here permission [#7631](https://github.com/RocketChat/Rocket.Chat/issues/7631)
+- [#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053) Add support to external livechat queue service provider
+- [#8411](https://github.com/RocketChat/Rocket.Chat/pull/8411) Contextual Bar Redesign
+- [#9234](https://github.com/RocketChat/Rocket.Chat/pull/9234) Indicate the Self DM room
+- [#9135](https://github.com/RocketChat/Rocket.Chat/pull/9135) Livechat extract lead data from message
+- [#9245](https://github.com/RocketChat/Rocket.Chat/pull/9245) new layout for emojipicker
+- [#9216](https://github.com/RocketChat/Rocket.Chat/pull/9216) Sidebar menu option to mark room as unread
+- [#9442](https://github.com/RocketChat/Rocket.Chat/pull/9442) Update documentation: provide example for multiple basedn
+- [#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) Contextual bar mail messages
+
+
+### Bug Fixes
+
+- [#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) announcement hyperlink color
+- [#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) custom emoji size on sidebar item
+- [#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335) Deleting message with store last message not removing
+- [#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) English Typos
+- [#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264) File access not working when passing credentials via querystring
+- [#9164](https://github.com/RocketChat/Rocket.Chat/pull/9164) Fix closing livechat inquiry
+- [#9393](https://github.com/RocketChat/Rocket.Chat/pull/9393) Fix incoming livechat when impersonating an agent
+- [#9451](https://github.com/RocketChat/Rocket.Chat/pull/9451) Fix livechat build
+- [#9452](https://github.com/RocketChat/Rocket.Chat/pull/9452) Fix livechat register form
+- [#9365](https://github.com/RocketChat/Rocket.Chat/pull/9365) Force enable Livechat Facebook integration on specific errors
+- [#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) Highlight setting not working correctly
+- [#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) last message cutting on bottom
+- [#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309) LDAP/AD is not importing all users
+- [#9437](https://github.com/RocketChat/Rocket.Chat/pull/9437) Missing sidebar paddings on mobile
+- [#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272) Missing translations
+- [#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173) oauth not working because of email array
+- [#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) popover on safari for iOS
+- [#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274) Remove sweetalert from livechat facebook integration page
+- [#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277) Restore translations from other languages
+- [#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) sidebar footer padding
+- [#9428](https://github.com/RocketChat/Rocket.Chat/pull/9428) Slash command 'archive' throws exception if the channel does not exist
+- [#9435](https://github.com/RocketChat/Rocket.Chat/pull/9435) Slash command 'unarchive' throws exception if the channel does not exist
+- [#9432](https://github.com/RocketChat/Rocket.Chat/pull/9432) Subscriptions not removed when removing user
+- [#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) svg render on firefox
+- [#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) Wrong position of notifications alert in accounts preference page
+- [#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) Contextual bar redesign
+- [#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506) Fix livechat visitor edit
+- [#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) large names on userinfo, and admin user bug on users with no usernames
+
+
+
+
+Others
+
+- [#9369](https://github.com/RocketChat/Rocket.Chat/pull/9369) [FIX][i18n] add room type translation support for room-changed-privacy message
+- [#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439) Add community bot
+- [#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) Develop sync - Bump version to 0.61.0-develop
+- [#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) Fix: Improved README.md
+- [#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) Fix: README typo
+- [#9395](https://github.com/RocketChat/Rocket.Chat/pull/9395) Move all npm from meteor packages to package.json & Update versions
+- [#1](https://github.com/RocketChat/Rocket.Chat/pull/1) Notify user if channel does not exist
+- [#2](https://github.com/RocketChat/Rocket.Chat/pull/2) Sync With RocketChat
+- [#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346) Update Marked dependecy to 0.3.9
+- [#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356) Use correct version of Mailparser module
+- [#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490) Update license
+- [#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504) Prevent NPM package-lock inside livechat
+- [#9516](https://github.com/RocketChat/Rocket.Chat/pull/9516) Fix: Add title to user info header
+- [#9513](https://github.com/RocketChat/Rocket.Chat/pull/9513) Fix: contextual bar new roles icons
+- [#9528](https://github.com/RocketChat/Rocket.Chat/pull/9528) Fix: Last message layout breaking with Markdown and Code Highlight
+- [#9526](https://github.com/RocketChat/Rocket.Chat/pull/9526) Fix: Notification Preferences panel is using old layout
+- [#9521](https://github.com/RocketChat/Rocket.Chat/pull/9521) Fix: OTR modal title
+- [#9515](https://github.com/RocketChat/Rocket.Chat/pull/9515) Fix: Remove login/register/forgot password labels
+- [#9517](https://github.com/RocketChat/Rocket.Chat/pull/9517) Fix: Scroll firefox
+- [#9514](https://github.com/RocketChat/Rocket.Chat/pull/9514) Fix: z-index on unread-messages and room-leader
+
+
+
+
+Details
+
+## 0.61.0-rc.2 (2018-01-26)
+
+
+### New Features
+
+- [#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) Contextual bar mail messages
+
+
+### Bug Fixes
+
+- [#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506) Fix livechat visitor edit
+- [#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) large names on userinfo, and admin user bug on users with no usernames
+
+
+
+Others
+
+- [#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504) Prevent NPM package-lock inside livechat
+
+
+
+
+## 0.61.0-rc.1 (2018-01-25)
+
+
+### Bug Fixes
+
+- [#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) Contextual bar redesign
+
+
+
+Others
+
+- [#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490) Update license
+
+
+
+
+## 0.61.0-rc.0 (2018-01-21)
+
+
+### BREAKING CHANGES
+
+- [#9048](https://github.com/RocketChat/Rocket.Chat/pull/9048) Decouple livechat visitors from regular users
+
+
+### New Features
+
+- [#9366](https://github.com/RocketChat/Rocket.Chat/pull/9366) add /home link to sidenav footer logo
+- [#9107](https://github.com/RocketChat/Rocket.Chat/pull/9107) Add impersonate option for livechat triggers
+- [#9228](https://github.com/RocketChat/Rocket.Chat/pull/9228) Add mention-here permission [#7631](https://github.com/RocketChat/Rocket.Chat/issues/7631)
+- [#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053) Add support to external livechat queue service provider
+- [#8411](https://github.com/RocketChat/Rocket.Chat/pull/8411) Contextual Bar Redesign
+- [#9234](https://github.com/RocketChat/Rocket.Chat/pull/9234) Indicate the Self DM room
+- [#9135](https://github.com/RocketChat/Rocket.Chat/pull/9135) Livechat extract lead data from message
+- [#9245](https://github.com/RocketChat/Rocket.Chat/pull/9245) new layout for emojipicker
+- [#9216](https://github.com/RocketChat/Rocket.Chat/pull/9216) Sidebar menu option to mark room as unread
+- [#9442](https://github.com/RocketChat/Rocket.Chat/pull/9442) Update documentation: provide example for multiple basedn
+
+
+### Bug Fixes
+
+- [#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) announcement hyperlink color
+- [#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) custom emoji size on sidebar item
+- [#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335) Deleting message with store last message not removing
+- [#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) English Typos
+- [#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264) File access not working when passing credentials via querystring
+- [#9164](https://github.com/RocketChat/Rocket.Chat/pull/9164) Fix closing livechat inquiry
+- [#9393](https://github.com/RocketChat/Rocket.Chat/pull/9393) Fix incoming livechat when impersonating an agent
+- [#9451](https://github.com/RocketChat/Rocket.Chat/pull/9451) Fix livechat build
+- [#9452](https://github.com/RocketChat/Rocket.Chat/pull/9452) Fix livechat register form
+- [#9365](https://github.com/RocketChat/Rocket.Chat/pull/9365) Force enable Livechat Facebook integration on specific errors
+- [#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) Highlight setting not working correctly
+- [#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) last message cutting on bottom
+- [#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309) LDAP/AD is not importing all users
+- [#9437](https://github.com/RocketChat/Rocket.Chat/pull/9437) Missing sidebar paddings on mobile
+- [#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272) Missing translations
+- [#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173) oauth not working because of email array
+- [#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) popover on safari for iOS
+- [#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274) Remove sweetalert from livechat facebook integration page
+- [#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277) Restore translations from other languages
+- [#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) sidebar footer padding
+- [#9428](https://github.com/RocketChat/Rocket.Chat/pull/9428) Slash command 'archive' throws exception if the channel does not exist
+- [#9435](https://github.com/RocketChat/Rocket.Chat/pull/9435) Slash command 'unarchive' throws exception if the channel does not exist
+- [#9432](https://github.com/RocketChat/Rocket.Chat/pull/9432) Subscriptions not removed when removing user
+- [#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) svg render on firefox
+- [#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) Wrong position of notifications alert in accounts preference page
+
+
+
+Others
+
+- [#9369](https://github.com/RocketChat/Rocket.Chat/pull/9369) [FIX][i18n] add room type translation support for room-changed-privacy message
+- [#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439) Add community bot
+- [#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) Develop sync - Bump version to 0.61.0-develop
+- [#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) Fix: Improved README.md
+- [#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) Fix: README typo
+- [#9395](https://github.com/RocketChat/Rocket.Chat/pull/9395) Move all npm from meteor packages to package.json & Update versions
+- [#1](https://github.com/RocketChat/Rocket.Chat/pull/1) Notify user if channel does not exist
+- [#2](https://github.com/RocketChat/Rocket.Chat/pull/2) Sync With RocketChat
+- [#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346) Update Marked dependecy to 0.3.9
+- [#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356) Use correct version of Mailparser module
+
+
+
+
+
+## 0.60.4 (2018-01-10)
+
+
+### Bug Fixes
+
+- [#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) Highlight setting not working correctly
+
+
+
+Others
+
+- [#9377](https://github.com/RocketChat/Rocket.Chat/pull/9377) Release 0.60.4
+
+
+
+
+
+## 0.60.4-rc.1 (2018-01-08)
+
+
+### Bug Fixes
+
+- [#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) announcement hyperlink color
+- [#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335) Deleting message with store last message not removing
+- [#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) last message cutting on bottom
+- [#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) popover on safari for iOS
+
+
+
+Others
+
+- [#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346) Update Marked dependecy to 0.3.9
+
+
+
+
+
+## 0.60.4-rc.0 (2018-01-05)
+
+
+### Bug Fixes
+
+- [#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343) LDAP TLS not working in some cases
+
+
+
+
+## 0.60.3 (2018-01-03)
+
+
+### Bug Fixes
+
+- [#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) custom emoji size on sidebar item
+- [#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) English Typos
+- [#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309) LDAP/AD is not importing all users
+- [#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) sidebar footer padding
+- [#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) svg render on firefox
+- [#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) Wrong position of notifications alert in accounts preference page
+
+
+
+Others
+
+- [#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) Fix: Improved README.md
+- [#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) Fix: README typo
+- [#9320](https://github.com/RocketChat/Rocket.Chat/pull/9320) Release 0.60.3
+
+
+
+
+
+## 0.60.2 (2017-12-29)
+
+
+### Bug Fixes
+
+- [#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272) Missing translations
+- [#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274) Remove sweetalert from livechat facebook integration page
+- [#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277) Restore translations from other languages
+
+
+
+Others
+
+- [#9280](https://github.com/RocketChat/Rocket.Chat/pull/9280) Release 0.60.2
+
+
+
+
+
+## 0.60.1 (2017-12-28)
+
+
+### Bug Fixes
+
+- [#9262](https://github.com/RocketChat/Rocket.Chat/pull/9262) File access not working when passing credentials via querystring
+
+
# 0.60.0 (2017-12-27)
diff --git a/package.json b/package.json
index c3ff7a73ad32..3b2f481cb956 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "0.61.0-develop",
+ "version": "0.61.2",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-cors/cors.js b/packages/rocketchat-cors/cors.js
index f458a73ca778..a41a833d1598 100644
--- a/packages/rocketchat-cors/cors.js
+++ b/packages/rocketchat-cors/cors.js
@@ -3,6 +3,11 @@ import _ from 'underscore';
import url from 'url';
+import tls from 'tls';
+// FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316
+// TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853
+tls.DEFAULT_ECDH_CURVE = 'auto';
+
WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) {
if (req._body) {
return next();
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index e55c976a78be..195ab20cf67e 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -1796,6 +1796,7 @@
"theme-custom-css": "Benutzerdefiniertes CSS",
"theme-font-body-font-family": "Schrift-Familie für den Textkörper",
"There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt",
+ "There_are_no_applications": "Bisher wurden keine oAuth Anwendungen hinzugefügt.",
"There_are_no_integrations": "Es sind keine Integrationen vorhanden",
"There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet",
"This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet",
@@ -2065,4 +2066,4 @@
"your_message_optional": "Ihre optionale Nachricht",
"Your_password_is_wrong": "Falsches Passwort",
"Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 6d3ca84df074..743ec575c97e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1390,8 +1390,8 @@
"Notification_Duration": "Notification Duration",
"Notification_Mobile_Default_For": "Push Mobile Notifications For",
"Notifications": "Notifications",
- "Notifications_Always_Notify_Mobile" : "Always notify mobile",
- "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.",
+ "Notifications_Always_Notify_Mobile": "Always notify mobile",
+ "Notifications_Always_Notify_Mobile_Description": "Choose to always notify mobile device regardless of presence status.",
"Notifications_Duration": "Notifications_Duration",
"Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
"Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
@@ -1647,7 +1647,7 @@
"run-migration_description": "Permission to run the migrations",
"Running_Instances": "Running Instances",
"S_new_messages_since_s": "%s new messages since %s",
- "Same_As_Token_Sent_Via" : "Same as \"Token Sent Via\"",
+ "Same_As_Token_Sent_Via": "Same as \"Token Sent Via\"",
"Same_Style_For_Mentions": "Same style for mentions",
"SAML": "SAML",
"SAML_Custom_Cert": "Custom Certificate",
@@ -1918,6 +1918,7 @@
"theme-custom-css": "Custom CSS",
"theme-font-body-font-family": "Body Font Family",
"There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.",
+ "There_are_no_applications": "No oAuth Applications have been added yet.",
"There_are_no_integrations": "There are no integrations",
"There_are_no_users_in_this_role": "There are no users in this role.",
"This_conversation_is_already_closed": "This conversation is already closed.",
@@ -2215,4 +2216,4 @@
"your_message_optional": "your message (optional)",
"Your_password_is_wrong": "Your password is wrong!",
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 1217e8b52184..d869357e085b 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1323,4 +1323,4 @@
"your_message_optional": "sua mensagem (opcional)",
"Your_password_is_wrong": "Sua senha está errada!",
"Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 42a873734bd7..7e5d014c8bd1 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -1348,4 +1348,4 @@
"your_message_optional": "sua mensagem (opcional)",
"Your_password_is_wrong": "Sua senha está errada!",
"Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 950fc9f603aa..0599a6e3b200 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "0.61.0-develop"
+ "version": "0.61.2"
}