Merge branch '2.2.x' into 2.3.x

5 years ago · e9e4a34e62
parent 8cd0f5684e ee00b57a78
commit e9e4a34e62
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,6 +8,7 @@
 .#*
 .*.md.html
 .DS_Store
+.attach_pid*
 .classpath
 .factorypath
 .gradle