Gustavo Cortez ef0b558ed9 fix conflicts		2014-01-20 18:52:28 -03:00
..
controllers	fix conflicts	2014-01-20 18:52:28 -03:00
models	fix conflicts	2014-01-20 18:52:28 -03:00
views	footer with info from bitcoind. it updates when get new block	2014-01-17 17:57:28 -03:00