mirrors/donphan
1
0
Fork 0
mirror of https://github.com/Siphonay/mastodon synced 2025-02-12 12:24:46 +00:00
Code Releases Activity
donphan/spec/views/about
History
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon 
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
..
_contact.html.haml_spec.rb
Redesign /terms page (#4338)
2017-07-24 17:15:15 +02:00
show.html.haml_spec.rb
Merge branch 'master' of https://github.com/tootsuite/mastodon
2018-02-23 23:28:31 +09:00