tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [tinkerpop] 04/04: Merge branch 'tp33'
Date Thu, 11 Oct 2018 16:12:32 GMT
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 <spmva@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(-)



Mime
View raw message