Skip to content

Commit

Permalink
Merge origin/master into newLicense
Browse files Browse the repository at this point in the history 
Conflicts:
	pom.xml
  • Loading branch information
Erwan Bocher committed May 23, 2016
2 parents 888d25f + 382b009 commit dc6036f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit dc6036f

Please sign in to comment.