Commit 6ea469ee authored by Anton Smirnov's avatar Anton Smirnov
Browse files

Merge branch '3.x' 

# Conflicts:
#	composer.json
parents d7fb0906 c10fbdae

There are no changes