tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3d033a468748338b6036cb24bb00ea4e88656ae6
Mastodon/Gemfile
T
David Yip 3d033a4687 Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00

3.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink