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
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-13 18:13:43 +02:00
2019-09-10 12:43:06 +02:00
2019-09-05 11:36:41 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-12 04:58:33 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-13 18:13:43 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-13 18:13:43 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-03-24 18:44:59 +01:00
2019-06-10 21:36:20 +02:00
2019-08-17 22:02:37 +02:00
2019-04-21 04:52:20 +02:00
2019-02-23 18:41:28 +01:00
2019-06-12 15:56:18 +02:00
2019-02-11 07:41:35 +01:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
74c5b2bd08