1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-17 08:03:53 -05:00
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
..