treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/db
History
Thibaut Girka 4837d6275a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
 		2019-09-18 17:25:56 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00