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
..
2018-12-12 05:54:34 +01:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00