Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
assets	…
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	…
json_ld	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	2019-07-28 13:48:43 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
paperclip	Fix converted media being saved with original extension and mime type (#11130)	2019-06-20 10:52:36 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
templates	…
cli.rb	Add `tootctl preview_cards remove` (#11320)	2019-07-28 13:48:19 +02:00