diff options
author | 2019-09-07 20:44:09 +0200 | |
---|---|---|
committer | 2019-09-07 20:44:09 +0200 | |
commit | 0a07a1359fc2efbb5aa7f9c1a7db0b6bdd428a7b (patch) | |
tree | 691def66c7c03fe5880f80d5957b9bd5a0dafb88 /src/components | |
parent | Fix ferdi branding (diff) | |
download | ferdium-app-0a07a1359fc2efbb5aa7f9c1a7db0b6bdd428a7b.tar.gz ferdium-app-0a07a1359fc2efbb5aa7f9c1a7db0b6bdd428a7b.tar.zst ferdium-app-0a07a1359fc2efbb5aa7f9c1a7db0b6bdd428a7b.zip |
Fix errors in 5.3.0 version merge
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 16 | ||||
-rw-r--r-- | src/components/ui/PremiumFeatureContainer/index.js | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index df91929cb..b59e3a74a 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -283,13 +283,15 @@ export default @observer class EditSettingsForm extends Component { | |||
283 | </p> | 283 | </p> |
284 | <p className="settings__message"> | 284 | <p className="settings__message"> |
285 | <span className="mdi mdi-github-face" /> | 285 | <span className="mdi mdi-github-face" /> |
286 | Ferdi is based on | 286 | <span> |
287 | {' '} | 287 | Ferdi is based on |
288 | <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a> | 288 | {' '} |
289 | , a project published | 289 | <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a> |
290 | under the | 290 | , a project published |
291 | {' '} | 291 | under the |
292 | <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a> | 292 | {' '} |
293 | <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a> | ||
294 | </span> | ||
293 | </p> | 295 | </p> |
294 | </form> | 296 | </form> |
295 | </div> | 297 | </div> |
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js index c53d345a0..7ba353be3 100644 --- a/src/components/ui/PremiumFeatureContainer/index.js +++ b/src/components/ui/PremiumFeatureContainer/index.js | |||
@@ -9,7 +9,7 @@ import { oneOrManyChildElements } from '../../../prop-types'; | |||
9 | import UserStore from '../../../stores/UserStore'; | 9 | import UserStore from '../../../stores/UserStore'; |
10 | 10 | ||
11 | import styles from './styles'; | 11 | import styles from './styles'; |
12 | import { FeatureStore } from '../../../features/utils/FeatureStore'; | 12 | import FeatureStore from '../../../stores/FeaturesStore'; |
13 | 13 | ||
14 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
15 | action: { | 15 | action: { |