search

symfony-cmf / seo-bundle

A SEO Solution for duplicate contents, page titles, etc.
https://cmf.symfony.com
47 stars 27 forks source link

Update master from 1.3 #305

Closed dbu closed 8 years ago

wouterj commented 8 years ago

@dbu I think it's better to just execute git merge locally instead of using a intermediate branch to merge both

dbu commented 8 years ago

well, like this i get the full build matrix from travisci, just in case i mess something up.

the conflict was only on something that was actually changed in #303 , so conflicts indeed are solved with this process too.