decabeza 99023a01c9 Fix merge conflicts

2019-04-29 14:22:22 +02:00

..

assets

Prevent long action content break dashboard layout

2019-04-24 14:08:15 +02:00

controllers

Merge branch 'master' into proposal-dashboard

2019-04-29 13:48:23 +02:00

helpers

Add default actions list on admin dashboard actions index

2019-04-24 14:05:05 +02:00

mailers

Merge branch 'master' into proposal-dashboard

2019-03-28 01:26:04 +01:00

models

Fix merge conflicts

2019-04-29 14:22:22 +02:00

views

Hide request to admin button for archived proposals

2019-04-24 14:08:22 +02:00