poanetwork
/
web3.js
mirror of https://github.com/poanetwork/web3.js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js.map
	dist/ethereum.min.js
This commit is contained in:
Marek Kotewicz 2015-04-02 13:09:35 +02:00
parent 5e150378c8 b7a03cd88e
commit 31e046dbec
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ethereum.js", "name": "ethereum.js",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.2.1", "version": "0.2.2",
"description": "Ethereum Compatible JavaScript API", "description": "Ethereum Compatible JavaScript API",
"main": [ "main": [
"./dist/ethereum.js", "./dist/ethereum.js",

2
dist/ethereum-light.js vendored
View File

@ -1100,7 +1100,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],7:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],7:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.2.1" "version": "0.2.2"
} }
},{}],8:[function(require,module,exports){ },{}],8:[function(require,module,exports){

2
dist/ethereum-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.js vendored
View File

@ -1100,7 +1100,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],7:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],7:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.2.1" "version": "0.2.2"
} }
},{}],8:[function(require,module,exports){ },{}],8:[function(require,module,exports){

2
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/version.json
View File

@ -1,3 +1,3 @@
{ {
"version": "0.2.1" "version": "0.2.2"
} }

2
package.js
View File

@ -1,7 +1,7 @@
/* jshint ignore:start */ /* jshint ignore:start */
Package.describe({ Package.describe({
name: 'ethereum:js', name: 'ethereum:js',
version: '0.2.1', version: '0.2.2',
summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC', summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
git: 'https://github.com/ethereum/ethereum.js', git: 'https://github.com/ethereum/ethereum.js',
// By default, Meteor will default to using README.md for documentation. // By default, Meteor will default to using README.md for documentation.

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ethereum.js", "name": "ethereum.js",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.2.1", "version": "0.2.2",
"description": "Ethereum JavaScript API, middleware to talk to a ethreum node over RPC", "description": "Ethereum JavaScript API, middleware to talk to a ethreum node over RPC",
"main": "./index.js", "main": "./index.js",
"directories": { "directories": {