Skip to content
Snippets Groups Projects
Unverified Commit 025da8ee authored by Simonas Šerlinskas's avatar Simonas Šerlinskas
Browse files

Merge remote-tracking branch 'remotes/upstream/5.x' into 6.x 

# Conflicts:
#	.travis.yml
#	composer.json
#	tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
parents a5729780 ce0875f1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment