Files
nairobi/app/controllers
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
..
2016-06-16 18:40:05 +02:00
2016-01-18 13:05:00 +01:00
2015-12-16 11:45:46 +01:00
2016-02-08 18:40:01 +01:00
2016-03-04 18:46:27 +01:00