4 Commits

Author	SHA1	Message	Date
Mario Colque	50dae263b7	conflict solved	2014-01-08 12:23:25 -03:00
Mario Colque	c967df577e	added new blocklist page	2014-01-08 11:56:36 -03:00
Gustavo Cortez	92054210a8	block page draft	2014-01-08 11:05:19 -03:00
Gustavo Cortez	1ec2984bab	Frontend: Blocks controller for angularjs	2014-01-08 09:32:38 -03:00