aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-10-26 20:03:34 +0200
committerLibravatar GitHub <noreply@github.com>2017-10-26 20:03:34 +0200
commitea208b8713cb477de9c699beee5ef46c3cc0044c (patch)
tree9235581bc6aacc6a805f3058cc2f22f18a41fe4f /src
parentBugfix: When reordering make sure the new indexes are applied correctly (diff)
parentMerge pull request #128 from DBozhinovski/master (diff)
downloadferdium-app-ea208b8713cb477de9c699beee5ef46c3cc0044c.tar.gz
ferdium-app-ea208b8713cb477de9c699beee5ef46c3cc0044c.tar.zst
ferdium-app-ea208b8713cb477de9c699beee5ef46c3cc0044c.zip
Merge branch 'develop' into orderingJumpFix
Diffstat (limited to 'src')
-rw-r--r--src/components/layout/Sidebar.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 4aee1ec60..6a5c0f365 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -52,7 +52,7 @@ export default class Sidebar extends Component {
52 <button 52 <button
53 onClick={openSettings} 53 onClick={openSettings}
54 className="sidebar__settings-button" 54 className="sidebar__settings-button"
55 data-tip={`Settings (${ctrlKey}+,)`} 55 data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
56 > 56 >
57 {isPremiumUser && ( 57 {isPremiumUser && (
58 <span className="emoji"> 58 <span className="emoji">