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

..

assets

improves ballot list on sidebar

2017-05-11 13:12:26 +02:00

controllers

Merge branch 'master' into api-dev-PRs

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

helpers

improves banners helper

2017-04-28 13:05:05 +02:00

mailers

sends unfeasible budget investment

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

models

Merge branch 'master' into api-dev-PRs

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

views

removes bold on links and make consistent text

2017-05-11 17:24:39 +02:00