Spencer Gibb dcc4e7da05 Merge branch '1.4.x' ...

# Conflicts:
#	docs/pom.xml

2017-11-28 12:31:53 -05:00

..

src/main/asciidoc

Merge pull request #831 from tomcruise81/documentation/issue_827

2017-11-06 15:00:36 -05:00

pom.xml

Merge branch '1.4.x'

2017-11-28 12:31:53 -05:00