Merge branch '2015.11-develop' into 2016.11

[tine20] / tine20 / composer.lock

diff --git a/tine20/composer.lock b/tine20/composer.lock
index e5f8054..ca64ae3 100644 (file)
--- a/tine20/composer.lock
+++ b/tine20/composer.lock
@@ -1216,11 +1216,11 @@
         },
         {
             "name": "syncroton/syncroton",
         },
         {
             "name": "syncroton/syncroton",

-            "version": "1.2.1",
+            "version": "1.2.2",

             "source": {
                 "type": "git",
                 "url": "http://git.syncroton.org/Syncroton",
             "source": {
                 "type": "git",
                 "url": "http://git.syncroton.org/Syncroton",

-                "reference": "31d151de7cba6fa95ffd34efffd85444ccab0b2d"
+                "reference": "05ff4ef7b67d7ad92ca21a8b086c5e92e090a365"

             },
             "require": {
                 "php": ">=5.3.0",
             },
             "require": {
                 "php": ">=5.3.0",