diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
| commit | 9a3d91f629ae0e8f722d56b8634bfad299ab9f04 (patch) | |
| tree | 324a2b04d34049d7f31a041d6a44b23d45a46e6b /db/schema.rb | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | b59fb28e90bc21d6fd1a6bafd13cfbd81ab5be54 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
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 01a95c0f2..7462bf2c7 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_11_04_133904) do +ActiveRecord::Schema.define(version: 2022_12_06_114142) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |