diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
| commit | c790ecb14d8b06c6242886ff4d2cdf06e70c5cac (patch) | |
| tree | dff0bfefe5a1922c7227ea1ec0236b92e11db699 /public/emoji/1f624.svg | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 764b89939fe2fcb8c4389738af8685949104c144 (diff) | |
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.
Diffstat (limited to 'public/emoji/1f624.svg')
0 files changed, 0 insertions, 0 deletions