luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-13 00:45:17 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00