Merge branch 'feature/promoted-gabs' of https://code.gab.com/gab/social/gab-social into develop

2019-09-03 18:38:37 -04:00
parent 89ac473195 d853beebb7
commit e856e2a136
17 changed files with 226 additions and 22 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,8 @@ en:
      moderator: Mod
    unavailable: Profile unavailable
    unfollow: Unfollow
+  promotions:
+      title: Promotions
  admin:
    account_actions:
      action: Perform action