aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/tabs
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2021-09-07 16:15:41 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2021-09-07 16:15:41 +0000
commit8af1f08539d7c2863107bd3dfd36002b7558e252 (patch)
treea50006d11cdf6b834b49c2c98dc192609ba4471a /src/components/settings_modal/tabs
parent25a8b48bf28e1a0e0765f28221c5528f5854656b (diff)
parent4d73eaa6cef7a8b81bcca719755b11c05717d395 (diff)
Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering Closes #935 See merge request pleroma/pleroma-fe!1392
Diffstat (limited to 'src/components/settings_modal/tabs')
-rw-r--r--src/components/settings_modal/tabs/theme_tab/theme_tab.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
index 8b81db5d..0b6669fc 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@@ -475,7 +475,7 @@ export default {
this.loadThemeFromLocalStorage(false, true)
break
case 'file':
- console.err('Forcing snapshout from file is not supported yet')
+ console.error('Forcing snapshot from file is not supported yet')
break
}
this.dismissWarning()