tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
29b5b46c87979f49e2d1c4e574429ac649ff2bdf
Mastodon/app/javascript/mastodon/locales/defaultMessages.json
David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
2018-02-04 16:36:19 -06:00

42 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink