rgarcia 0505be08e8 fixes conflicts

2016-01-25 22:24:58 +01:00

..

migrate

fixes conflicts

2016-01-25 22:24:58 +01:00

dev_seeds.rb

fixes conflicts

2016-01-25 22:24:58 +01:00

schema.rb

fixes conflicts

2016-01-25 22:24:58 +01:00

seeds.rb

Feature flag spending proposals

2016-01-18 13:05:00 +01:00