Browse Source

Merged in FD3-203 (pull request #23)

Update vendor ik/workflow-bundle
Guillermo Espinoza 7 năm trước cách đây
mục cha
commit
3f211fdfef
2 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 2 2
      composer.json
  2. 5 5
      composer.lock

+ 2 - 2
composer.json

@@ -120,13 +120,13 @@
         "voryx/restgeneratorbundle": "dev-master",
         "ik/base-admin-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-drone-fix",
+        "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/workflow-bundle": "dev-master",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "ik/template-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
-        "ik/device-bundle": "dev-drone-fix",
+        "ik/device-bundle": "dev-master",
         "ik/owner-voter-bundle": "dev-master",
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "ik/migrations-bundle": "dev-master",

+ 5 - 5
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "eb0e4660efd8c7c8e667abf9e8b50437",
+    "content-hash": "fd260ad86210b789972a4b87f2f87819",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1439,7 +1439,7 @@
         },
         {
             "name": "ik/device-bundle",
-            "version": "dev-drone-fix",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
@@ -1628,7 +1628,7 @@
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-drone-fix",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
@@ -2077,7 +2077,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "KnpLabs",
+                    "name": "Knplabs",
                     "homepage": "http://knplabs.com"
                 },
                 {
@@ -2136,7 +2136,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "KnpLabs",
+                    "name": "Knplabs",
                     "homepage": "http://knplabs.com"
                 },
                 {