Merge remote-tracking branch 'upstream/1.5' into 1.5 · ezsystems/ezplatform-ee-demo@1cd23e4 · GitHub

This repository has been archived by the owner on Aug 6, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'upstream/1.5' into 1.5

Browse files

# Conflicts:
#	composer.json

Loading branch information

Lukasz Serwatka committed Sep 20, 2016

2 parents d6b1d34 + 7e8088c commit 1cd23e4