Merged 2.0 into master #151

Merged
merged 16 commits into from May 11, 2012

3 participants

@pulse00

Solved 2 (trivial) conflicts:

  • Thumbnail/FormatThumbnail.php: DocBlock return type
  • composer.json

see 52b3706

@rande rande and 1 other commented on an outdated diff May 11, 2012
.travis.yml
@@ -7,7 +8,10 @@ env:
- SYMFONY_VERSION=v2.0.12
@rande
Sonata Project member
rande added a note May 11, 2012

this should point to the master only, I think you need to change the notification url to point to the master

@pulse00
pulse00 added a note May 11, 2012

is it possible to add travis tests for sonata PRs? this would make merging easier.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@rande rande commented on an outdated diff May 11, 2012
composer.json
"suggest": {
- "sonata-project/doctrine-orm-admin-bundle": "*",
- "knplabs/gaufrette" : "*",
- "imagine/Imagine" : "dev-master",
- "kriswallsmith/buzz" : "dev-master"
+ "sonata-project/doctrine-orm-admin-bundle": "2.0.*",
@rande
Sonata Project member
rande added a note May 11, 2012

this should point to the master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@pulse00

@rande tests pass now.

@rande rande merged commit 9d174cb into sonata-project:master May 11, 2012
@PHDA PHDA pushed a commit to PHDA/SonataMediaBundle that referenced this pull request Oct 7, 2014
@rande rande Fix #151 - Fix event with IE8 7163344
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment