From: Dessalines <tyhou13@gmx.com>
Date: Wed, 23 Sep 2020 21:16:18 +0000 (-0500)
Subject: Merge branch 'add-view-helper-functions' of https://github.com/eiknat/lemmy into... 
X-Git-Url: http://these/git/%7B%60/feeds/front/%24%7BUserService.Instance.auth%7D.xml?a=commitdiff_plain;h=ab17e0a9f39e8ed55eacef29d01615c1c4ba121e;p=lemmy.git

Merge branch 'add-view-helper-functions' of https://github.com/eiknat/lemmy into eiknat-add-view-helper-functions
---

ab17e0a9f39e8ed55eacef29d01615c1c4ba121e
diff --cc migrations/2020-09-07-231141_add_migration_utils/down.sql
index 00000000,80dc308a..80dc308a
mode 000000,100644..100644
--- a/migrations/2020-09-07-231141_add_migration_utils/down.sql
+++ b/migrations/2020-09-07-231141_add_migration_utils/down.sql
diff --cc migrations/2020-09-07-231141_add_migration_utils/up.sql
index 00000000,8f9552ea..8f9552ea
mode 000000,100644..100644
--- a/migrations/2020-09-07-231141_add_migration_utils/up.sql
+++ b/migrations/2020-09-07-231141_add_migration_utils/up.sql