diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
| commit | 4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9 (patch) | |
| tree | 00a495e6f4abf68dbb9ecceae729c9e5345c318a /db/schema.rb | |
| parent | ac300173f68d2497cccf4e5bf558d95fc6105c96 (diff) | |
| parent | 443d114574ef152f14815afc5c4ed5c977dd9205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 8d2894236..241bda8b8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_03_10_060959) do +ActiveRecord::Schema.define(version: 2022_03_16_233212) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |