milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-02 18:42:39 -05:00
parent 4e979c8a0f
commit f9d4af0ef6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.21", "version": "1.0.20",
"_release": "1.0.21", "_release": "1.0.20",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.21", "tag": "1.0.20",
"commit": "e341b097c05c31ec012e04dfbd0455ae9dfc4929" "commit": "55cf67710a438d3eea15f58587b2c2fcd731bf29"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.11", "version": "1.0.6",
"_release": "1.0.11", "_release": "1.0.6",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.11", "tag": "1.0.6",
"commit": "8838a06a04887893b4a0e165764067409f4f3518" "commit": "4d04f0ed205e94c00160c48dc131b9d8dbed995f"
}, },
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0", "_target": "~1.0.0",