Merge branch 'greentext-strikes-back' into 'develop'

⑨ Added greentext support ⑨ Closes #9 See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00 · 2019-11-19 14:22:17 +00:00 · 0eda60eeb4
commit 0eda60eeb4
parent aa1b812484 28efd7d862
10 changed files with 256 additions and 13 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -370,6 +370,8 @@
      "false": "no",
      "true": "yes"
    },
+    "fun": "Fun",
+    "greentext": "Meme arrows",
    "notifications": "Notifications",
    "notification_setting": "Receive notifications from:",
    "notification_setting_follows": "Users you follow",