Skip to content

Commit f991536

Browse files
Merge remote-tracking branch 'remotes/dev/3.1' into 3.1
2 parents 7a3f35a + c65966e commit f991536

File tree

1 file changed

+19
-25
lines changed

1 file changed

+19
-25
lines changed

dev.lock

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"_readme": [
33
"This file locks the dependencies of your project to a known state",
4-
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
4+
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
55
"This file is @generated automatically"
66
],
77
"content-hash": "a55b8e9a79fff7f134a013f381929b7a",
@@ -12,7 +12,7 @@
1212
"target-dir": "Akeneo/Bundle/BatchBundle",
1313
"source": {
1414
"type": "git",
15-
"url": "https://github.com/laboro/BatchBundle.git",
15+
"url": "git@github.com:laboro/BatchBundle.git",
1616
"reference": "aff218f6ba5714baae575698c0578bf8da207f41"
1717
},
1818
"dist": {
@@ -54,9 +54,6 @@
5454
"Reader",
5555
"Writer"
5656
],
57-
"support": {
58-
"source": "https://github.com/laboro/BatchBundle/tree/0.4.8"
59-
},
6057
"time": "2018-03-20T11:52:51+00:00"
6158
},
6259
{
@@ -617,7 +614,7 @@
617614
"shasum": null
618615
},
619616
"type": "bower-asset",
620-
"time": "2014-07-21T18:45:41+00:00"
617+
"time": "2014-07-21 18:45:41"
621618
},
622619
{
623620
"name": "bower-asset/font-awesome",
@@ -874,7 +871,7 @@
874871
"shasum": null
875872
},
876873
"type": "bower-asset",
877-
"time": "2018-04-29T21:14:49+00:00"
874+
"time": "2018-04-29 21:14:49"
878875
},
879876
{
880877
"name": "bower-asset/jsplumb",
@@ -1341,16 +1338,16 @@
13411338
},
13421339
{
13431340
"name": "composer/ca-bundle",
1344-
"version": "1.1.2",
1341+
"version": "1.1.3",
13451342
"source": {
13461343
"type": "git",
13471344
"url": "https://github.com/composer/ca-bundle.git",
1348-
"reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
1345+
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
13491346
},
13501347
"dist": {
13511348
"type": "zip",
1352-
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
1353-
"reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
1349+
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
1350+
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
13541351
"shasum": ""
13551352
},
13561353
"require": {
@@ -1393,7 +1390,7 @@
13931390
"ssl",
13941391
"tls"
13951392
],
1396-
"time": "2018-08-08T08:57:40+00:00"
1393+
"time": "2018-10-18T06:09:13+00:00"
13971394
},
13981395
{
13991396
"name": "composer/composer",
@@ -6266,13 +6263,13 @@
62666263
"dist": {
62676264
"type": "path",
62686265
"url": "../../package/dotmailer",
6269-
"reference": "5cf94587ac91de7d6f9629c14e9b135e36b10b25",
6266+
"reference": "b0fde2ceb212ac3ec0ab08593b6dca5118346be7",
62706267
"shasum": null
62716268
},
62726269
"require": {
62736270
"oro/crm": "3.1.*",
62746271
"oro/marketing": "3.1.*",
6275-
"romanpitak/dotmailer-api-v2-client": "1.1.*"
6272+
"romanpitak/dotmailer-api-v2-client": "3.0.*"
62766273
},
62776274
"type": "library",
62786275
"extra": {
@@ -6653,7 +6650,7 @@
66536650
"dist": {
66546651
"type": "path",
66556652
"url": "../../package/platform",
6656-
"reference": "fb68b364bdbda6cc25cdf54d9f111baf26f2a1c0",
6653+
"reference": "e7141cfaafd3cb40c5b4ff2c6d53751eb8c2f480",
66576654
"shasum": null
66586655
},
66596656
"require": {
@@ -6753,7 +6750,7 @@
67536750
"symfony/polyfill-php70": "1.*",
67546751
"symfony/security-acl": "~3.0.0",
67556752
"symfony/swiftmailer-bundle": "2.6.*",
6756-
"symfony/symfony": "3.4.14",
6753+
"symfony/symfony": "^3.4 <3.4.15",
67576754
"tinymce/tinymce": "4.6.*",
67586755
"twig/extensions": "1.5.*",
67596756
"twig/twig": "1.35.*",
@@ -7700,16 +7697,16 @@
77007697
},
77017698
{
77027699
"name": "romanpitak/dotmailer-api-v2-client",
7703-
"version": "v1.1.3",
7700+
"version": "3.0.0",
77047701
"source": {
77057702
"type": "git",
7706-
"url": "https://github.com/laboro/dotMailer-API-v2-PHP-client.git",
7707-
"reference": "36cd6cef8ca1b7c45e9ae109da83014e4cc2d0b7"
7703+
"url": "git@github.com:laboro/dotMailer-API-v2-PHP-client.git",
7704+
"reference": "40a8603a8c7be29afff2a8f0b816f88085f27064"
77087705
},
77097706
"dist": {
77107707
"type": "zip",
7711-
"url": "https://api.github.com/repos/laboro/dotMailer-API-v2-PHP-client/zipball/36cd6cef8ca1b7c45e9ae109da83014e4cc2d0b7",
7712-
"reference": "36cd6cef8ca1b7c45e9ae109da83014e4cc2d0b7",
7708+
"url": "https://api.github.com/repos/laboro/dotMailer-API-v2-PHP-client/zipball/40a8603a8c7be29afff2a8f0b816f88085f27064",
7709+
"reference": "40a8603a8c7be29afff2a8f0b816f88085f27064",
77137710
"shasum": ""
77147711
},
77157712
"require": {
@@ -7744,10 +7741,7 @@
77447741
"v2",
77457742
"version 2"
77467743
],
7747-
"support": {
7748-
"source": "https://github.com/laboro/dotMailer-API-v2-PHP-client/tree/v1.1.3"
7749-
},
7750-
"time": "2016-07-01T23:56:02+00:00"
7744+
"time": "2017-05-25T17:29:35+00:00"
77517745
},
77527746
{
77537747
"name": "romanpitak/php-rest-client",

0 commit comments

Comments
 (0)