kikito 5903ebe857 merges master and fix conflicts

2015-09-12 19:54:15 +02:00

..

migrate

merges master and fix conflicts

2015-09-12 19:54:15 +02:00

dev_seeds.rb

merges master and fix conflicts

2015-09-12 19:54:15 +02:00

schema.rb

merges master and fix conflicts

2015-09-12 19:54:15 +02:00

seeds.rb

adds proposal_code_prefix to Settings

2015-09-12 13:14:45 +02:00