fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-11 21:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/db
History
Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
2020-12-19 00:55:12 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
views Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00