3 Commits

Author SHA1 Message Date
Wolf Posdorfer
f2ac02f2e2 Revert "Merge branch 'master' into release/0.15"
This reverts commit 340d9f7687538918722b4906f74ca5bb976453fd, reversing
changes made to a90bb33e9019d6f4506db2f4fb04c956161c89a2.
2018-01-30 12:38:37 +01:00
Wolf Posdorfer
7ef2e0c9a2 Merge branch 'release/0.12.0.1'
# Conflicts:
#	.circleci.settings.xml
#	circle.yml
#	pom.xml
2017-11-14 14:49:08 +01:00
Wolf Posdorfer
1eb109c038 CircleCI branch 2017-11-14 14:36:39 +01:00