Merge branch 'master' into glitch-soc/merge-upstream

2019-02-15 18:02:45 +01:00
parent 2769b54466 8ef50706a1
commit 06cc04fd23
30 changed files with 408 additions and 148 deletions
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,5 +1,4 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-agent: *
-# Disallow: /
+
+User-agent: *
+Disallow: /media_proxy/