Merge branch 'tp31'

Resolved Conflicts:
        README.asciidoc


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/90793661
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/90793661
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/90793661

Branch: refs/heads/TINKERPOP-1278
Commit: 907936614b4af24bb9fd383005d10c758303ff6b
Parents: ddddc5f 029f56b
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Authored: Thu Jun 2 17:29:04 2016 +0200
Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Committed: Thu Jun 2 17:29:04 2016 +0200

----------------------------------------------------------------------
 README.asciidoc     |  8 ++++----
 bin/publish-docs.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to