tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-28 10:33:07 -05:00

History

Thibaut Girka 5cadb47238 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

confirmations_controller.rb

2019-09-05 11:36:41 +02:00

omniauth_callbacks_controller.rb

2019-07-22 10:48:50 +02:00

passwords_controller.rb

2018-08-01 00:18:13 +02:00

registrations_controller.rb

2019-07-23 10:51:07 +02:00

sessions_controller.rb

2019-09-18 17:25:56 +02:00

setup_controller.rb

2019-07-22 10:48:50 +02:00