djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-13 19:54:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
02062aab55
tootlab-mastodon/spec/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
..
show.html.haml_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00