1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-17 08:03:53 -05:00
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..