Merge branch 'master' of https://bitbucket.org/ikflowdat/ftth

composer.json

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

composer.lock

@@ -4,31 +4,8 @@
         "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": "02da0e407d512618f1bb3fca37860c81",
+    "content-hash": "48293851f5a8948819b446864fecad24",
     "packages": [
-        {
-            "name": "base-admin",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "99f21f03eeade4f8498ac2a7ee106ada60aef429"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Base\\AdminBundle\\": ""
-                }
-            },
-            "description": "The Flowdat3 Symfony Admin Generator",
-            "keywords": [
-                "Admin Generator",
-                "admin",
-                "bootstrap",
-                "sonata"
-            ],
-            "time": "2017-04-12 12:42:01"
-        },
         {
             "name": "behat/transliterator",
             "version": "v1.2.0",
@@ -1279,6 +1256,29 @@
             ],
             "time": "2017-01-08T14:13:58+00:00"
         },
+        {
+            "name": "ik/base-admin-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+                "reference": "24fff73a5df56804a6fe2a67a636a76b1db0f2cf"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Base\\AdminBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Symfony Admin Generator",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bootstrap",
+                "sonata"
+            ],
+            "time": "2017-04-13 11:59:50"
+        },
         {
             "name": "ik/oauthclient-bundle",
             "version": "dev-master",
@@ -1333,7 +1333,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "a6efb73f958b2a94d1c4e926dd37ca6ec317ddba"
+                "reference": "ade8225852429e2ada5ae607d1777073d30ff9c0"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1363,7 +1363,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-04-12 12:40:09"
+            "time": "2017-04-12 16:06:14"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -5425,7 +5425,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "voryx/restgeneratorbundle": 20,
-        "base-admin": 20,
+        "ik/base-admin-bundle": 20,
         "ik/oauthclient-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/workflow-bundle": 20