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

Conflicts: - app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
parent 2c2f649200 c88d9e524b
commit 33c80e0783
67 changed files with 896 additions and 288 deletions
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -2,3 +2,4 @@

 User-agent: *
 Disallow: /media_proxy/
+Disallow: /interact/