Merge branch '2.1.x' into 2.2.x

russellyou · Jun 8, 2020 · ee00b57 · ee00b57
2 parents 13564b4 + b59b48e
commit ee00b57
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 .#*
 .*.md.html
 .DS_Store
+.attach_pid*
 .classpath
 .factorypath
 .gradle