Matias Alejo Garcia 05f2cf426c resolve merge		2014-01-20 16:47:46 -03:00
..
controllers	resolve merge	2014-01-20 16:47:46 -03:00
models	resolve merge	2014-01-20 16:47:46 -03:00
views	footer with info from bitcoind. it updates when get new block	2014-01-17 17:57:28 -03:00