You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/10/11 16:12:32 UTC

[tinkerpop] 04/04: Merge branch 'tp33'

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f1a12acba6de4addfe65853afaa9caf06dd2324a
Merge: 92aa0d7 077b144
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Oct 11 12:09:34 2018 -0400

    Merge branch 'tp33'
    
    Conflicts:
    	docs/src/reference/intro.asciidoc

 docs/src/reference/intro.asciidoc          |  16 ++++++++--------
 docs/static/images/traversal-mechanics.png | Bin 138828 -> 52187 bytes
 2 files changed, 8 insertions(+), 8 deletions(-)