IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-13 00:45:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.5.4' into develop

Browse Source
This commit is contained in:
James Cole 2015-12-18 08:13:28 +01:00
commit 08a53156bd
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
composer.lock generated
View File

@ -670,16 +670,16 @@
}, },
{ {
"name": "grumpydictator/gchart", "name": "grumpydictator/gchart",
"version": "1.0.9", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/JC5/gchart.git", "url": "https://github.com/JC5/gchart.git",
"reference": "920a0494a0697472bf81c0111b6825c516099e59" "reference": "0b1de3e045aaf19bb17658d3e81db706d6945e5d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/JC5/gchart/zipball/920a0494a0697472bf81c0111b6825c516099e59", "url": "https://api.github.com/repos/JC5/gchart/zipball/0b1de3e045aaf19bb17658d3e81db706d6945e5d",
"reference": "920a0494a0697472bf81c0111b6825c516099e59", "reference": "0b1de3e045aaf19bb17658d3e81db706d6945e5d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -702,7 +702,7 @@
} }
], ],
"description": "GChart is a small package that allows you to easily generate data for the Google Charts API.", "description": "GChart is a small package that allows you to easily generate data for the Google Charts API.",
"time": "2015-04-05 19:17:17" "time": "2015-12-15 21:07:33"
}, },
{ {
"name": "illuminate/html", "name": "illuminate/html",
@ -897,16 +897,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.1.26", "version": "v5.1.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c" "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/be7fbb60376bd61f07e9c637473e5b2cf7eebe5c", "url": "https://api.github.com/repos/laravel/framework/zipball/b16f80878fd3603022d3c84593397cedd9af0bcf",
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c", "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -952,7 +952,6 @@
"illuminate/events": "self.version", "illuminate/events": "self.version",
"illuminate/exception": "self.version", "illuminate/exception": "self.version",
"illuminate/filesystem": "self.version", "illuminate/filesystem": "self.version",
"illuminate/foundation": "self.version",
"illuminate/hashing": "self.version", "illuminate/hashing": "self.version",
"illuminate/http": "self.version", "illuminate/http": "self.version",
"illuminate/log": "self.version", "illuminate/log": "self.version",
@ -1022,7 +1021,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2015-12-02 21:59:57" "time": "2015-12-17 20:35:38"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
@ -2656,16 +2655,16 @@
}, },
{ {
"name": "watson/validating", "name": "watson/validating",
"version": "1.0.7", "version": "1.0.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dwightwatson/validating.git", "url": "https://github.com/dwightwatson/validating.git",
"reference": "24b3b0b933180ef997d99e3c342f95955abbbdf2" "reference": "0b225ddc3187745ff9efcbcd0d9b4b712df190ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dwightwatson/validating/zipball/24b3b0b933180ef997d99e3c342f95955abbbdf2", "url": "https://api.github.com/repos/dwightwatson/validating/zipball/0b225ddc3187745ff9efcbcd0d9b4b712df190ba",
"reference": "24b3b0b933180ef997d99e3c342f95955abbbdf2", "reference": "0b225ddc3187745ff9efcbcd0d9b4b712df190ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2707,7 +2706,7 @@
"laravel", "laravel",
"validation" "validation"
], ],
"time": "2015-11-21 02:31:18" "time": "2015-12-16 23:15:51"
}, },
{ {
"name": "zizaco/entrust", "name": "zizaco/entrust",