search

symfony-cmf / block-bundle

Extends the SonataBlockBundle to integrate with PHPCR ODM
https://cmf.symfony.com
20 stars 51 forks source link

Update master from 1.3 #255

Closed dbu closed 8 years ago

dbu commented 8 years ago

This brings #253 to master.

@craescu can you please check if i solved the conflicts correctly?

my plan is to first merge this to master so that the 2 branches are still in sync, and then you can rebase #252 on master so that we get the refactoring in.

vcraescu commented 8 years ago

Looks fine too me!