Alberto Garcia Cabeza 9ad798d26d Fixes conflicts

2015-12-03 20:50:21 +01:00

..

assets

Improves styles for proposals and buttons

2015-12-03 20:25:14 +01:00

controllers

removes provisional transparency page

2015-12-03 20:46:19 +01:00

helpers

removes provisional transparency page

2015-12-03 12:51:51 +01:00

mailers

fixes specs

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

models

Move automatic official_level assignment to the controller.

2015-12-01 23:18:23 +01:00

views

Fixes conflicts

2015-12-03 20:50:21 +01:00