tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e7a0840f8cfcc199665db43e28af74ec56ffe734
Mastodon/app/javascript/mastodon/locales/en.json
David Yip 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00

14 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink