Merge branch '1.2.x'

10 years ago · 8f089fcae7
parent 3048f44a96 0174476ff1
commit 8f089fcae7
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,3 +31,4 @@ overridedb.*
 .idea
 *.jar
 .DS_Store
+.factorypath