mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity
glitch-social/app/views/about
History
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
 		2019-03-13 15:16:02 +01:00
..
_login.html.haml Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
_registration.html.haml Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
more.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
show.html.haml Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
terms.html.haml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00