diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-22 17:51:38 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-22 17:51:38 +0200 |
| commit | dcded13a996e1b6b87444641eed66fc2d117e1af (patch) | |
| tree | 1be2c25853e7196a38b0bebc13e9f5281a24d908 /public/emoji/1f477-1f3fb-200d-2642-fe0f.svg | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | 4f0bdbaaaf6828d7ee6fd6e6023375b727c0afe5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
Diffstat (limited to 'public/emoji/1f477-1f3fb-200d-2642-fe0f.svg')
0 files changed, 0 insertions, 0 deletions