Skip to content

Commit

Permalink
Merge branch '1.7.X' into 1.8.X
Browse files Browse the repository at this point in the history 
Conflicts:
	pom.xml
  • Loading branch information
@gonzalezsieira
gonzalezsieira committed May 9, 2017
2 parents 4bc13c5 + a54a5f9 commit 375a25b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 375a25b

Please sign in to comment.