Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 13:56:56 +0000 (14:56 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 13:56:56 +0000 (14:56 +0100)
Change-Id: I2a4adc2d78adf30051266bd9780f5374d7272d1b

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/Model/Message.php
tine20/Tinebase/Mail.php
tine20/composer.lock

Simple merge
Simple merge
              "time": "2013-10-02 15:59:03"
          },
          {
 +            "name": "symfony/console",
 +            "version": "v2.8.2",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/console.git",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.9",
 +                "symfony/polyfill-mbstring": "~1.0"
 +            },
 +            "require-dev": {
 +                "psr/log": "~1.0",
 +                "symfony/event-dispatcher": "~2.1|~3.0.0",
 +                "symfony/process": "~2.1|~3.0.0"
 +            },
 +            "suggest": {
 +                "psr/log": "For using the console logger",
 +                "symfony/event-dispatcher": "",
 +                "symfony/process": ""
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "2.8-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Component\\Console\\": ""
 +                },
 +                "exclude-from-classmap": [
 +                    "/Tests/"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Fabien Potencier",
 +                    "email": "fabien@symfony.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony Console Component",
 +            "homepage": "https://symfony.com",
 +            "time": "2016-01-14 08:33:16"
 +        },
 +        {
 +            "name": "symfony/polyfill-mbstring",
 +            "version": "v1.0.1",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/polyfill-mbstring.git",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.3"
 +            },
 +            "suggest": {
 +                "ext-mbstring": "For best performance"
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "1.0-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Polyfill\\Mbstring\\": ""
 +                },
 +                "files": [
 +                    "bootstrap.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Nicolas Grekas",
 +                    "email": "p@tchwork.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony polyfill for the Mbstring extension",
 +            "homepage": "https://symfony.com",
 +            "keywords": [
 +                "compatibility",
 +                "mbstring",
 +                "polyfill",
 +                "portable",
 +                "shim"
 +            ],
 +            "time": "2015-11-20 09:19:13"
 +        },
 +        {
              "name": "syncroton/syncroton",
-             "version": "1.2.3",
+             "version": "1.2.4",
              "source": {
                  "type": "git",
                  "url": "http://git.syncroton.org/Syncroton",
              ],
              "description": "Library to sync mobile devices",
              "homepage": "http://www.syncroton.org",
-             "time": "2016-10-31 16:16:43"
+             "time": "2016-11-03 08:10:34"
          },
          {
 +            "name": "tine20/composerapploader",
 +            "version": "dev-master",
 +            "source": {
 +                "type": "git",
 +                "url": "http://git.tine20.org/git/composerapploader",
 +                "reference": "b9e480b6c26f6556ca742e96badfeb1ebd59ecb7"
 +            },
 +            "require": {
 +                "composer-plugin-api": ">=1.0.0"
 +            },
 +            "require-dev": {
 +                "composer/composer": "1.*"
 +            },
 +            "type": "composer-plugin",
 +            "extra": {
 +                "class": "Tine20\\ComposerAppLoader\\Plugin"
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Tine20\\ComposerAppLoader\\": "src/"
 +                }
 +            },
 +            "time": "2016-07-14 11:55:28"
 +        },
 +        {
              "name": "twig/twig",
              "version": "v1.27.0",
              "source": {