diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
| commit | 980c004f0601bbfaf440c0ea56de408ccfd79007 (patch) | |
| tree | 8ed051d5e8b9c530b3282cfd84e34e50b3bcfa57 /app/javascript/styles/contrast/diff.scss | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
Diffstat (limited to 'app/javascript/styles/contrast/diff.scss')
0 files changed, 0 insertions, 0 deletions