Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-07-17 18:00:26 +02:00
commit 033442094b
1 changed files with 0 additions and 2 deletions

2
.gitignore vendored
View File

@ -15,7 +15,6 @@ bin
build
lib/
target
.factorypath
.springBeans
interpolated*.xml
dependency-reduced-pom.xml
@ -33,6 +32,5 @@ overridedb.*
.idea
*.jar
.DS_Store
.factorypath
dump.rdb
transaction-logs