Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pbsky/community-skeleton
Browse files Browse the repository at this point in the history
…into pbsky-master
  • Loading branch information
sanjeev committed Apr 28, 2020
2 parents 1a9c5e6 + a2d4975 commit a57cee9
Show file tree
Hide file tree
Showing 2 changed files with 344 additions and 358 deletions.
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"symfony/maker-bundle": "^1.0",
"symfony/profiler-pack": "*",
"symfony/test-pack": "*",
"symfony/web-server-bundle": "4.3.*"
"symfony/web-server-bundle": "4.3.*",
"uvdesk/api-bundle": "^1.0@dev"
},
"config": {
"preferred-install": {
Expand Down Expand Up @@ -82,5 +83,10 @@
"conflict": {
"symfony/symfony": "*"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"minimum-stability": "dev"
}
Loading

0 comments on commit a57cee9

Please sign in to comment.