mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
migrate
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
post_migrate
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 13:23:02 +01:00
schema.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
seeds.rb
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00