Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
deltatag committed Jan 19, 2018
2 parents 52d75ac + cd6903a commit 445104d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pimcore/customer-management-framework-bundle",
"license": "GPL-3.0+",
"license": "GPL-3.0-or-later",
"type": "pimcore-bundle",
"config": {
"sort-packages": true
Expand Down

0 comments on commit 445104d

Please sign in to comment.