tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
763cda91a83dd7e3eea7afb2dbe1ff149d849b87
Mastodon/app/views/about/show.html.haml
T
David Yip 3ab6a8b8be Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00

6.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink