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
..
controllers	…
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	…
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
workers	…
rails_helper.rb	…
spec_helper.rb	…