fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solving conflicts merging with develop branch

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2020-01-06 09:03:37 -04:00
parent 375c6569f8 fa1d704dad
commit cd91821310
39 changed files with 4047 additions and 1914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@@ -2898,16 +2898,16 @@
},
{
"name": "smarty/smarty",
"version": "v2.6.30",
"version": "v2.6.31",
"source": {
"type": "git",
"url": "https://github.com/smarty-php/smarty.git",
"reference": "c5c9d6514ceaf15fe35345886668726829560f93"
"reference": "4ab9757b492f08a38f68123a6e7c1df7110bbc49"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/c5c9d6514ceaf15fe35345886668726829560f93",
"reference": "c5c9d6514ceaf15fe35345886668726829560f93",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/4ab9757b492f08a38f68123a6e7c1df7110bbc49",
"reference": "4ab9757b492f08a38f68123a6e7c1df7110bbc49",
"shasum": ""
},
"require": {