Alberto Garcia Cabeza 910b24936d Merge branch 'master' into voting-proposals ...

Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb

2016-09-15 13:58:53 +02:00

..

migrate

adds emailed_at attribute to notifications

2016-08-03 19:33:23 +02:00

dev_seeds.rb

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

schema.rb

Adds proposal ballots controller and views

2016-09-07 12:43:12 +02:00

seeds.rb

Adds admin setting 'months to archive proposals'

2016-09-09 18:02:02 +02:00