Alberto Garcia Cabeza b84730aac0 Merge branch 'master' into design_layout

2016-01-07 16:21:00 +01:00

..

assets

Merge branch 'master' into design_layout

2016-01-07 16:21:00 +01:00

controllers

Removes unused orders from debates controller

2016-01-05 19:37:56 +01:00

helpers

uses proposal total_votes for % helper methods

2015-12-18 13:15:00 +01:00

mailers

fixes specs

2015-11-09 14:27:56 +01:00

models

hides the admin checkboxes in annotator when editing an existing annotation

2015-12-18 16:31:30 +01:00

views

Merge branch 'master' into design_layout

2016-01-07 16:21:00 +01:00