luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-26 00:34:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/views/about
History
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
..
_contact.html.haml_spec.rb
show.html.haml_spec.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00