catstodon/spec/views/about
Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/settings.yml
2018-08-01 22:20:25 +02: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' into glitch-soc/merge-upstream 2018-08-01 22:20:25 +02:00