Merge develop and fix conflict

2019-01-26 17:50:41 +02:00 · 2019-01-26 17:50:41 +02:00 · 0ab828bb30
commit 0ab828bb30
parent 3978aaef84 8197c77f75
25 changed files with 2489 additions and 312 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -327,6 +327,7 @@
    "block": "Block",
    "blocked": "Blocked!",
    "deny": "Deny",
+    "favorites": "Favorites",
    "follow": "Follow",
    "follow_sent": "Request sent!",
    "follow_progress": "Requesting…",