5 Commits

Author	SHA1	Message	Date
Gustavo Cortez	011ca9310b	fix conflicts	2014-01-22 18:15:29 -03:00
Matias Alejo Garcia	9337196233	fix conflics	2014-01-21 11:20:25 -03:00
Manuel Araoz	e45c1ef2bd	remove old style angular module def	2014-01-20 18:09:18 -03:00
Manuel Araoz	cf5aea1165	socket.io and angular proper integration	2014-01-20 13:31:37 -03:00
Gustavo Cortez	8906a2f24f	footer with info from bitcoind. it updates when get new block	2014-01-17 17:57:28 -03:00