[tinkerpop] branch master updated (faf8473 -> 25f9088)

[oy...@apache.org]

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

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


    from faf8473  Merge branch '3.5-dev'
     add f52abb2  TINKERPOP-2574 Don't gitignore package-lock.json CTR
     add c85cec2  Merge branch '3.4-dev' into 3.5-dev
     new 25f9088  Merge branch '3.5-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |    1 -
 .../gremlin-javascript/package-lock.json           | 5828 ++++++++++++++++++++
 2 files changed, 5828 insertions(+), 1 deletion(-)
 create mode 100644 gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json

[tinkerpop] 01/01: Merge branch '3.5-dev'

[oy...@apache.org]

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

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

commit 25f908856162d679d8891fe8a94c3d8e84ff7a57
Merge: faf8473 c85cec2
Author: oyvindsabo <oy...@gmail.com>
AuthorDate: Wed Jun 2 17:14:59 2021 +0200

    Merge branch '3.5-dev'

 .gitignore                                         |    1 -
 .../gremlin-javascript/package-lock.json           | 5828 ++++++++++++++++++++
 2 files changed, 5828 insertions(+), 1 deletion(-)