Luciano Andrade пре 7 година
родитељ
комит
5cd8936bf1
2 измењених фајлова са 9 додато и 9 уклоњено
  1. 2 2
      composer.json
  2. 7 7
      composer.lock

+ 2 - 2
composer.json

@@ -97,8 +97,8 @@
         "phpunit/phpunit": "5.5.*",
         "stof/doctrine-extensions-bundle": "^1.2",
         "voryx/restgeneratorbundle": "dev-master",
-        "ik/base-admin-bundle": "dev-FD3-99",
-        "ik/oauthclient-bundle": "dev-FD3-99",
+        "ik/base-admin-bundle": "dev-master",
+        "ik/oauthclient-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/workflow-bundle": "dev-master",

+ 7 - 7
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": "4f8355aad6a372bb638498da6bdaea30",
+    "content-hash": "38078f3bae2c25fd9046bdcb4c4f29b3",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1393,7 +1393,7 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-FD3-99",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
@@ -1485,7 +1485,7 @@
         },
         {
             "name": "ik/oauthclient-bundle",
-            "version": "dev-FD3-99",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
@@ -1586,7 +1586,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "c1b4a025c48ba2141b6934b912e8a5f189b4850e"
+                "reference": "0fc2cbf6e746cffe2c55025ea8054836ec096a54"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1616,7 +1616,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-08-01 18:48:35"
+            "time": "2017-08-04 14:29:28"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2010,7 +2010,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "KnpLabs",
+                    "name": "Knplabs",
                     "homepage": "http://knplabs.com"
                 },
                 {
@@ -2069,7 +2069,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "KnpLabs",
+                    "name": "Knplabs",
                     "homepage": "http://knplabs.com"
                 },
                 {