Files
grecia/app/assets/javascripts
MaiteHdezRivas 5dd4633d6a Merge branch 'suggest_before_creating'
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
..
2015-07-30 12:55:45 +02:00
2015-12-14 12:56:50 +01:00
2015-09-09 20:32:38 +02:00
2015-09-09 20:32:38 +02:00
2015-08-17 19:15:17 +02:00
2015-09-13 11:47:57 +02:00
2015-09-13 21:56:52 +02:00