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
..
2018-01-16 03:29:11 +01:00
2016-02-20 22:53:20 +01:00
2016-08-17 17:58:00 +02:00
2017-04-22 19:48:55 +02:00
2018-10-09 03:02:52 +02:00
2018-10-04 17:38:04 +02:00
2017-08-08 21:52:15 +02:00
2017-12-10 11:08:04 -08:00
2017-12-06 15:04:49 +09:00
2017-04-11 01:11:41 +02:00
2019-01-18 01:36:59 +01:00
2018-10-04 17:38:04 +02:00
2016-12-06 17:19:26 +01:00
2017-01-22 23:07:31 +01:00
2018-10-04 12:36:53 +02:00
2016-08-17 17:58:00 +02:00