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
..
admin
settings
application_helper.rb
flashes_helper.rb
home_helper.rb	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
instance_helper.rb
jsonld_helper.rb	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00