Fix Conflicts:

public/js/angularjs-all.min.js
	public/js/main.min.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-03 16:35:11 -03:00
commit 5e058c2f6f
4 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{
"name": "insight-bitcore",
"description": "An open-source frontend for the Insight API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.",
"version": "0.2.3",
"version": "0.2.4",
"author": {
"name": "Ryan X Charles",
"email": "ryan@bitpay.com"
@ -46,7 +46,7 @@
"start": "INSIGHT_PUBLIC_PATH=public node node_modules/.bin/insight-bitcore-api"
},
"dependencies": {
"insight-bitcore-api": ">=0.2.2"
"insight-bitcore-api": "git://github.com/bitpay/insight-api.git#v0.2.10"
},
"devDependencies": {
"bower": "~1.2.8",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long