Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
This commit is contained in:
Claire
2023-08-13 18:47:15 +02:00
194 changed files with 3931 additions and 2110 deletions

View File

@ -1,5 +1,8 @@
# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
User-agent: GPTBot
Disallow: /
User-agent: *
Disallow: /media_proxy/
Disallow: /interact/