Manuel Araoz 8207b07dc5 Merge branch 'master' of github.com:bitpay/insight into bug/wording_changes ... Conflicts: public/views/status.html		2014-01-21 16:34:12 -03:00
..
css	Merge pull request #112 from bechi/feature/01status-page	2014-01-21 11:11:20 -08:00
img	bootstrap ready!	2014-01-06 16:12:14 -03:00
js	Merge branch 'master' of github.com:bitpay/insight into feature/realtime-sync-info	2014-01-21 13:29:07 -03:00
sound	remove old sound	2014-01-20 17:34:59 -03:00
views	Merge branch 'master' of github.com:bitpay/insight into bug/wording_changes	2014-01-21 16:34:12 -03:00