You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
avatars/original	…
emoji	Add emojis:generate_borders Rake task (#13773)	5 years ago
headers/original	…
ocr/lang-data	Add OCR tool to media editing modal (#11566)	5 years ago
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	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	5 years ago
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	…
oops.gif	…
oops.png	Change error graphic to hover-to-play (#10055)	6 years ago
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	6 years ago
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…