diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-03 17:08:49 +0200 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-03 17:08:49 +0200 |
commit | fc4988cd5e54f44779f13732961a3f7b00619eaf (patch) | |
tree | 9e39d2d3baabba44a50cbde3649045579a51d7f6 /src/features | |
parent | add workspace premium badge in settings nav (diff) | |
parent | fix shitty twitter account typo (diff) | |
download | ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.gz ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.zst ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.zip |
fixes conflicts with latest develop
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/shareFranz/Component.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index ef43a54fa..8d1d595c5 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js | |||
@@ -38,7 +38,7 @@ const messages = defineMessages({ | |||
38 | }, | 38 | }, |
39 | shareTextTwitter: { | 39 | shareTextTwitter: { |
40 | id: 'feature.shareFranz.shareText.twitter', | 40 | id: 'feature.shareFranz.shareText.twitter', |
41 | defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz', | 41 | defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger', |
42 | }, | 42 | }, |
43 | }); | 43 | }); |
44 | 44 | ||