Merge remote-tracking branch 'origin/main' into main

berrysauce · berrysauce · commit 69b161a22a66 · 2020-12-17T16:38:06.000+01:00
# Conflicts:
#	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,3 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-
-# PyCharm
-.idea/
