james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix composer.lock

Browse Source
This commit is contained in:
Shish 2019-12-09 18:18:38 +00:00
parent 562a2c8fea
commit 3c3e551db2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
composer.lock generated
View File

@ -429,24 +429,20 @@
"crud", "crud",
"generator" "generator"
], ],
<<<<<<< HEAD
"time": "2019-12-07T22:47:15+00:00"
=======
"time": "2019-12-09T13:30:51+00:00" "time": "2019-12-09T13:30:51+00:00"
>>>>>>> use microhtml for ext_manager
}, },
{ {
"name": "shish/microhtml", "name": "shish/microhtml",
"version": "v1.0.1", "version": "v1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/shish/microhtml.git", "url": "https://github.com/shish/microhtml.git",
"reference": "1b81c6537eee07e7ba7fb4dbbf9ba2173e8c436c" "reference": "b942fe1da33cd8889252290469ce3ed2ea329491"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/shish/microhtml/zipball/1b81c6537eee07e7ba7fb4dbbf9ba2173e8c436c", "url": "https://api.github.com/repos/shish/microhtml/zipball/b942fe1da33cd8889252290469ce3ed2ea329491",
"reference": "1b81c6537eee07e7ba7fb4dbbf9ba2173e8c436c", "reference": "b942fe1da33cd8889252290469ce3ed2ea329491",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -479,7 +475,7 @@
"generator", "generator",
"html" "html"
], ],
"time": "2019-12-09T12:12:14+00:00" "time": "2019-12-09T14:15:35+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [