mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-28 08:11:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/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 Do not create empty a element when there is no e-mail (#4455) 2017-07-30 16:24:18 +02:00
_features.html.haml Redesign the landing page, mount public timeline on it (#4122) 2017-07-11 15:27:59 +02:00
_forms.html.haml Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
_links.html.haml Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
_registration.html.haml Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
more.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
show.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
terms.html.haml Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00