Gustavo Cortez 76862dc0f9 Merge branch 'master' into feature/blockpage ... Conflicts: app/models/Block.js config/routes.js Fixed!		2014-01-08 09:05:08 -03:00
..
Block.js	Merge branch 'master' into feature/blockpage	2014-01-08 09:05:08 -03:00
Transaction.js	transaction syncing working!	2014-01-08 01:37:29 -03:00