Alberto Miedes Garcés 5d9054d284 Merge branch 'master' into api-dev-PRs ...

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

2017-05-11 21:59:42 +02:00

..

migrate

Adds DB constraint to avoid duplicate balloted investments

2017-05-03 18:43:22 +02:00

dev_seeds.rb

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

schema.rb

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

seeds.rb

Merge branch 'master' into site-customization

2017-04-07 17:29:33 +02:00