rgarcia c2c7cdb18d Merge branch 'budget' into budget-public-controllers

2016-09-02 13:15:40 +02:00

..

migrate

Merge branch 'master' into budget

2016-09-02 12:47:54 +02:00

dev_seeds.rb

removes obsolete attribute reference

2016-07-27 13:03:49 +02:00

schema.rb

Merge branch 'budget' into budget-public-controllers

2016-09-02 13:15:40 +02:00

seeds.rb

fixes conflicts with budget

2016-07-27 11:41:46 +02:00