RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b7d3666249
flosight-api/app
History
Manuel Araoz b7d3666249 Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api 
Conflicts:
	app/controllers/socket.js
	app/models/Transaction.js
	lib/PeerSync.js
	public/js/controllers/address.js
	public/js/controllers/index.js
	public/js/controllers/transactions.js
	public/views/transaction.html
2014-01-20 11:47:22 -03:00
..
controllers Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api 2014-01-20 11:47:22 -03:00
models Merge branch 'master' of github.com:bitpay/insight into feature/address-socket-api 2014-01-20 11:47:22 -03:00
views footer with info from bitcoind. it updates when get new block 2014-01-17 17:57:28 -03:00