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

Merge remote-tracking branch 'remotes/upstream/2.x' 

# Conflicts:
#	.travis.yml
#	composer.json
parents 245ec169 6d7be3f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 20 deletions
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