Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Manual merge #212

Merged
merged 6 commits into from
Dec 17, 2017
Merged

Manual merge #212

merged 6 commits into from
Dec 17, 2017

Commits on Dec 7, 2017

  1. DevKit updates for 2.x branch (sonata-project#206) 

    * DevKit updates

* DevKit updates

* DevKit updates

* DevKit updates

* Remove StyleCI

* Fix cs

* Bump composer requirements
    @SonataCI @jordisala1991
    SonataCI authored and jordisala1991 committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    09ac395 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. DevKit updates (sonata-project#208)

    @SonataCI
    SonataCI committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    f3976fa View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2017

  1. DevKit updates (sonata-project#211)

    @SonataCI
    SonataCI committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    3e9fa05 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Make symfony dependencies explicit

    @jordisala1991 @OskarStark
    jordisala1991 authored and OskarStark committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    d68f22a View commit details
    Browse the repository at this point in the history

  2. Allow Symfony4

    @jordisala1991 @OskarStark
    jordisala1991 authored and OskarStark committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    b514cb4 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2017

  1. Merge remote-tracking branch 'origin/2.x'

    @greg0ire
    greg0ire committed Dec 17, 2017
    Configuration menu
    Copy the full SHA
    977bab6 View commit details
    Browse the repository at this point in the history