You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/db
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
6 years ago
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
seeds.rb Fix db:seed - only run some validations when the field was changed (#3592) 8 years ago