search

symfony-cmf / symfony-cmf-docs

The documentation for the symfony content management framework
http://cmf.symfony.com
44 stars 157 forks source link

update master from 1.2 #648

Closed dbu closed 9 years ago

dbu commented 9 years ago

seems like there are no conflicts or issues with this update. just merge?

dbu commented 9 years ago

oh, or not all fine. shall i merge this on the cli and solve conflicts? or does anybody see any issues with the diff?

dbu commented 9 years ago

merged on the cli