Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		2019-09-13 18:13:43 +02:00
..
_action_log.html.haml	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
_status.html.haml	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
index.html.haml	Fix display of instance actor in reports UI (#11798)	2019-09-09 20:42:43 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00