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-12-01 17:39:13 +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
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
2017-11-20 22:13:37 -08: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
2018-07-24 20:47:13 +02:00
2019-03-24 18:44:59 +01:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2019-06-10 21:36:20 +02:00
2018-05-03 15:54:10 +02:00
2019-08-17 22:02:37 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2018-08-18 01:00:01 +09:00
2019-02-23 18:41:28 +01:00
2019-06-12 15:56:18 +02:00
2019-01-08 14:09:57 +01:00
2018-12-22 23:32:00 +01:00
2018-09-02 03:14:46 +02:00
2018-01-03 21:00:39 +09:00
2018-05-10 14:48:26 +02:00
2019-02-11 07:41:35 +01:00
2018-01-05 04:43:50 +01:00
2018-01-03 21:00:39 +09:00
2017-11-25 03:39:57 +01:00
2018-09-02 18:20:26 +02:00
2018-05-03 15:54:10 +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
74c5b2bd08