diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
commit | 76918554a6898f9b94d4ffde07face01754fd058 (patch) | |
tree | fa394c02128610793353c0a6ba8363d814147ea4 /db/schema.rb | |
parent | 35c4ff07f4d61aaf7ade2ae17060298d62b3f643 (diff) | |
parent | f2f5c1bd6d37ec2ba7d0f98a3c0f8fead6b78f1d (diff) |
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
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 96961c812..aa02be55f 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: 2019_05_19_130537) do +ActiveRecord::Schema.define(version: 2019_05_29_143559) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |