rgarcia 0f1a98da7d fixes conflicts with master

2017-01-15 19:04:12 +01:00

..

assets

Merge pull request #1337 from consul/devise-views

2017-01-11 12:38:41 +01:00

controllers

Merge branch 'master' into budget-emails

2017-01-15 18:58:20 +01:00

helpers

Merge pull request #1336 from aspgems/bug_filter_advance_search

2017-01-13 11:00:00 +01:00

mailers

sends unfeasible budget investment

2017-01-14 17:02:33 +01:00

models

Merge branch 'master' into budget-emails

2017-01-15 18:58:20 +01:00

views

fixes conflicts with master

2017-01-15 19:04:12 +01:00