Merge branch 'develop' into feat/media-modal

2019-01-28 19:02:46 +02:00 · 2019-01-28 19:02:46 +02:00 · 51024a2c8a
commit 51024a2c8a
parent 676acdbf82 bb2ee04f04
16 changed files with 501 additions and 36 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -338,6 +338,7 @@
    "following": "Following!",
    "follows_you": "Follows you!",
    "its_you": "It's you!",
+    "media": "Media",
    "mute": "Mute",
    "muted": "Muted",
    "per_day": "per day",