merge with master

2016-01-14 13:03:48 +01:00
parent bcfe50b41e ed008f1b28
commit 326dd04ae7
93 changed files with 1789 additions and 504 deletions
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -86,5 +86,3 @@
    </div>
  </div>
 <% end %>
-
-