Revision fbc0c3a0e611b8b6e9c9404adfec38e9597c2fe5

Committed on 18/05/2015 4:42 am by xrowkristina <kristina@xrow.de> [GitHub Diff]

Merge branch 'master' of https://github.com/xrowgmbh/sylius-bundle

Conflicts:
Entity/Product.php