Merge branch 'master' into feature/socket-io-support

Browse source

Fixed conflicts on:
	index.html
	js/app.js

...

This commit is contained in:

Gustavo Cortez 2014-04-17 00:43:50 -03:00

parent 4865513c21 00529ba78f

commit 7d52f8487b

39 changed files with 1459 additions and 583 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

375

lib/bitcore.js Normal file

View file

File diff suppressed because one or more lines are too long