OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/db
History
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
 		2021-08-09 23:25:49 +02:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
views
…
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
seeds.rb
…