Merge remote-tracking branch 'upstream/master'

2020-04-15 08:41:17 +00:00
parent 988cec57b1 db1ecff52f
commit ec452de0b2
35 changed files with 67 additions and 66 deletions
@@ -0,0 +1,4 @@
+author: "ForrestWick"
+delete-after: True
+changes: 
+  - tweak: "changed a certain item to be called meatball, ended racism, thank you obama"
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes: 
+  - tweak: "remove any slurs, etc. to comply with GitHub's ToS"