Merge branch 'master' into issue#1575-tag-administration

2017-06-29 19:09:54 +02:00
parent dec6b67dba 76ac788823
commit 22d28d9c79
192 changed files with 1260 additions and 738 deletions
--- a/app/controllers/management/budgets/investments_controller.rb
+++ b/app/controllers/management/budgets/investments_controller.rb
@@ -20,7 +20,7 @@ class Management::Budgets::InvestmentsController < Management::BaseController
    @investment.author = managed_user

    if @investment.save
-      notice= t('flash.actions.create.notice', resource_name: Budget::Investment.model_name.human, count: 1)
+      notice = t('flash.actions.create.notice', resource_name: Budget::Investment.model_name.human, count: 1)
      redirect_to management_budget_investment_path(@budget, @investment), notice: notice
    else
      render :new