wtrinkl/asd-control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.wtrinkl.de/wtrinkl/asd-control

Browse Source
This commit is contained in:
Wilfried Trinkl
2018-11-02 07:46:39 +01:00
parent 09ee6ddc3e 59a00ef008
commit db6835c5da
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
composer.lock generated
View File

@@ -4,7 +4,12 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
<<<<<<< HEAD
"content-hash": "211736ac94b6bf2152703e36516b870b", "content-hash": "211736ac94b6bf2152703e36516b870b",
=======
"hash": "28923d4c444590eed22a413ddea60d0f",
"content-hash": "4e434b4c30749b442eed8f2e1497b92e",
>>>>>>> 59a00ef008f695571f3fd31366364b4f19701a54
"packages": [ "packages": [
{ {
"name": "aura/intl", "name": "aura/intl",
@@ -287,7 +292,11 @@
} }
], ],
"description": "A composer installer for CakePHP 3.0+ plugins.", "description": "A composer installer for CakePHP 3.0+ plugins.",
<<<<<<< HEAD
"time": "2017-12-24T21:09:29+00:00" "time": "2017-12-24T21:09:29+00:00"
=======
"time": "2017-12-24 21:09:29"
>>>>>>> 59a00ef008f695571f3fd31366364b4f19701a54
}, },
{ {
"name": "mobiledetect/mobiledetectlib", "name": "mobiledetect/mobiledetectlib",