Merge branch 'pbsky-master' into 1.0

skhetcho · Apr 28, 2020 · d383989 · d383989
2 parents 1a9c5e6 + a57cee9
commit d383989
Show file tree

Hide file tree

Showing 2 changed files with 344 additions and 358 deletions.
diff --git a/composer.json b/composer.json
@@ -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": {
@@ -82,5 +83,10 @@
     "conflict": {
         "symfony/symfony": "*"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
     "minimum-stability": "dev"
 }