Thibaut Girka
c790ecb14d
Merge branch 'master' into glitch-soc/merge-upstream ...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict due to upstream adding a new parameter (with_rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/services/post_status_service.rb`:
Conflict due to upstream adding a new parameter (rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to us not exposing theme settings here (as we have
a different flavour/skin menu).
Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
Coding style fixes for a part we have rewritten.
Discarded upstream changes.
2020-03-08 19:38:53 +01:00
2020-02-08 23:33:22 +01:00
2020-02-08 23:33:22 +01:00
2020-03-08 16:09:34 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 19:38:53 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 19:38:53 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-06 21:36:38 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-03-08 16:09:34 +01:00
2020-03-08 16:09:34 +01:00
2020-03-08 16:09:34 +01:00
2020-03-08 16:09:34 +01:00
2020-03-08 16:09:34 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-09 12:15:55 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-03-08 16:09:34 +01:00
2020-02-03 15:52:20 +01:00
2019-09-16 15:11:01 +02:00
2019-09-29 17:10:01 +02:00
2019-08-17 22:02:37 +02:00
2019-09-20 23:05:23 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2019-09-16 15:11:01 +02:00
2019-09-16 15:11:01 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
c790ecb14d