Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

Elasticsearch DSL
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a5729780

Unverified Commit a5729780 authored 7 years ago by Simonas Šerlinskas

Downloads
- Plain Diff

Merge remote-tracking branch '5.x' into 6.x

# Conflicts:
#	composer.json

parents e4df29d1 170b7e68

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

docs/Query/Span/SpanNear.md 40 additions, 1 deletion

docs/Query/Span/SpanNear.md
src/BuilderBag.php 1 addition, 1 deletion

src/BuilderBag.php
src/Query/Joining/NestedQuery.php 20 additions, 0 deletions

src/Query/Joining/NestedQuery.php
src/Search.php 2 additions, 0 deletions

src/Search.php
src/SearchEndpoint/AbstractSearchEndpoint.php 1 addition, 1 deletion

src/SearchEndpoint/AbstractSearchEndpoint.php

with 64 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment