Alberto Garcia Cabeza 2a3cbee96a Merge branch 'budgets' of github.com:consul/consul into budgets

2017-01-09 17:10:46 +01:00

..

assets

adds budget icon on investment show when no aside

2017-01-09 17:10:36 +01:00

controllers

fixes conflicts with budgets

2017-01-09 13:33:01 +01:00

helpers

fixes conflicts with budgets

2017-01-09 13:33:01 +01:00

mailers

Extract mailer from name and address to a setting

2016-12-23 11:28:53 +01:00

models

fixes conflicts with budgets

2017-01-09 13:33:01 +01:00

views

Merge branch 'budgets' of github.com:consul/consul into budgets

2017-01-09 17:10:46 +01:00