TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

deps: broccoli-merge-trees@2.0.0

Browse Source
This commit is contained in:
Kevin Ansfield 2017-03-08 11:26:53 +00:00
parent 57c6f27820
commit c0f74b561e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/package.json
View File

@ -33,7 +33,7 @@
"broccoli-clean-css": "^2.0.1",
"broccoli-concat": "3.2.2",
"broccoli-funnel": "1.1.0",
"broccoli-merge-trees": "1.2.1",
"broccoli-merge-trees": "2.0.0",
"broccoli-uglify-js": "0.2.0",
"chai-jquery": "2.0.0",
"codemirror": "5.24.2",

18
ghost/admin/yarn.lock
View File

@ -880,6 +880,13 @@ broccoli-merge-trees@1.2.1, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1
rimraf "^2.4.3"
symlink-or-copy "^1.0.0"
broccoli-merge-trees@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz#10aea46dd5cebcc8b8f7d5a54f0a84a4f0bb90b9"
dependencies:
broccoli-plugin "^1.3.0"
merge-trees "^1.0.1"
broccoli-middleware@^0.18.1:
version "0.18.1"
resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-0.18.1.tgz#bf525581c2deb652c425942b18580f76d3748122"
@ -4813,6 +4820,17 @@ merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
merge-trees@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
dependencies:
can-symlink "^1.0.0"
fs-tree-diff "^0.5.4"
heimdalljs "^0.2.1"
heimdalljs-logger "^0.1.7"
rimraf "^2.4.3"
symlink-or-copy "^1.0.0"
merge@1.2.0, merge@^1.1.3, merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"