forked from treehouse/mastodon
e2a2bc9021
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
shortcuts | ||
sounds | ||
500.html | ||
android-chrome-192x192.png | ||
apple-touch-icon.png | ||
background-cybre.png | ||
badge.png | ||
browserconfig.xml | ||
clock.js | ||
embed.js | ||
favicon-dev.ico | ||
favicon.ico | ||
inert.css | ||
logo-cybre-glitch.gif | ||
mask-icon.svg | ||
mstile-150x150.png | ||
oops.gif | ||
oops.png | ||
riot-glitch.png | ||
robots.txt | ||
sw.js | ||
web-push-icon_expand.png | ||
web-push-icon_favourite.png | ||
web-push-icon_reblog.png |