Merge branch 'tp32' into tp33
Conflicts:
docs/src/dev/developer/release.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/044cd1f4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/044cd1f4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/044cd1f4
Branch: refs/heads/master
Commit: 044cd1f47f18e612d9bef3ba85edacc24909b142
Parents: 906f244 cc7d2e2
Author: Stephen Mallette <[email protected]>
Authored: Mon May 14 09:04:58 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon May 14 09:04:58 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/044cd1f4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
