Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
78ff7e382103b1489e204d8fc3e02790a7d90b8d
mastodon/db
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
..
migrate
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-10 17:09:12 +02: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-05-10 17:09:12 +02:00
seeds.rb
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00