kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2020-09-14 20:01:47 +02:00
parent 1c3fe93d59 5ef45fd4a3
commit 039e654ef1
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
composer.lock generated
View File

@@ -1998,16 +1998,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.5.4", "version": "1.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba" "reference": "45832dfed6007b984c0d40addfac48d403dc6432"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/45832dfed6007b984c0d40addfac48d403dc6432",
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba", "reference": "45832dfed6007b984c0d40addfac48d403dc6432",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2019,7 +2019,7 @@
}, },
"require-dev": { "require-dev": {
"cebe/markdown": "~1.0", "cebe/markdown": "~1.0",
"commonmark/commonmark.js": "0.29.1", "commonmark/commonmark.js": "0.29.2",
"erusev/parsedown": "~1.0", "erusev/parsedown": "~1.0",
"ext-json": "*", "ext-json": "*",
"github/gfm": "0.29.0", "github/gfm": "0.29.0",
@@ -2089,7 +2089,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-08-18T01:19:12+00:00" "time": "2020-09-13T14:44:46+00:00"
}, },
{ {
"name": "league/csv", "name": "league/csv",
@@ -9439,12 +9439,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "425be18066a07ae07112a0aec85bf16f9cd02ed1" "reference": "5ae6aa6482b72946bc0d279c3b54dc1dbeae68d8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/425be18066a07ae07112a0aec85bf16f9cd02ed1", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5ae6aa6482b72946bc0d279c3b54dc1dbeae68d8",
"reference": "425be18066a07ae07112a0aec85bf16f9cd02ed1", "reference": "5ae6aa6482b72946bc0d279c3b54dc1dbeae68d8",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@@ -9731,7 +9731,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-09-11T17:02:36+00:00" "time": "2020-09-13T17:11:14+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

2
package.json
View File

@@ -17,7 +17,7 @@
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"laravel-mix": "^5.0", "laravel-mix": "^5.0",
"uiv": "^0.36", "uiv": "^0.37",
"vue": "^2.6", "vue": "^2.6",
"vue-i18n": "^8.20", "vue-i18n": "^8.20",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"

8
yarn.lock
View File

@@ -6354,10 +6354,10 @@ uglify-js@3.4.x:
commander "~2.19.0" commander "~2.19.0"
source-map "~0.6.1" source-map "~0.6.1"
uiv@^0.36: uiv@^0.37:
version "0.36.1" version "0.37.0"
resolved "https://registry.yarnpkg.com/uiv/-/uiv-0.36.1.tgz#9cf987b43e6a67ac50082c6b72d253e94d5d962c" resolved "https://registry.yarnpkg.com/uiv/-/uiv-0.37.0.tgz#a38ac511612ca9d4ead1b379b44cdca872ebd63e"
integrity sha512-kJjqShQa8+9DEQl7GXkR0rLaoUbHAvHLjkEpZzhdcA4O95UevZm2Dsal3xgyPSf634oUc2/XyksiOnDAwRDuGQ== integrity sha512-e1psC34ocS3toJOULKrnwsQOU6cKBcKYkikPO7ZMMZ2iJPzSH/Af05dLme0+78aUIF1OCaL7vluoHcC97KV4XQ==
dependencies: dependencies:
portal-vue "^2.1.7" portal-vue "^2.1.7"
vue-functional-data-merge "^2.0.3" vue-functional-data-merge "^2.0.3"