Skip to content

Commit

Permalink
Merge branch 'updates-08-02-2019'
Browse files Browse the repository at this point in the history
  • Loading branch information
tuj committed Feb 18, 2019
2 parents e71a6be + 4342f50 commit c28e819
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 32 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG

## 5.2.0

* Updated symfony/symfony: v2.8.49
* Updated os2display/core-bundle: 1.2.0
* Updated os2display/admin-bundle: 1.2.0
* Updated os2display/default-template-bundle: 1.1.1

## 5.1.2

* Merged https://github.com/os2display/admin/pull/17
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "os2display/admin",
"license": "GNU General Public License v3.0",
"license": "Mozilla Public License Version 2.0",
"type": "project",
"description": "The Os2Display distribution",
"autoload": {
Expand All @@ -10,12 +10,12 @@
}
},
"require": {
"os2display/admin-bundle": "^1.0",
"os2display/default-template-bundle": "^1.0",
"os2display/admin-bundle": "~1.0",
"os2display/default-template-bundle": "~1.0",
"incenteev/composer-parameter-handler": "^2.0",
"sonata-project/admin-bundle": "^2.0",
"sonata-project/doctrine-orm-admin-bundle": "^2.0",
"os2display/core-bundle": "^1.1"
"os2display/core-bundle": "~1.1"
},
"require-dev": {
"sensio/generator-bundle": "^2.3",
Expand Down
66 changes: 38 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c28e819

Please sign in to comment.