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-09-04 13:16:25 +02:00
2016-01-20 12:25:47 +01:00
2015-12-17 18:25:53 +01:00
2015-07-30 12:55:45 +02:00
2016-01-27 13:11:23 +01:00
2015-09-08 20:46:18 +02:00
2015-10-27 01:02:39 +01:00
2015-09-18 01:25:55 +02:00
2015-12-18 17:13:52 +01:00
2015-09-18 01:25:55 +02:00
2015-12-14 12:56:50 +01:00
2015-08-28 17:02:06 +02:00
2015-08-24 18:35:59 +02:00
2015-08-24 18:45:22 +02:00
2015-09-13 14:39:38 +02:00
2015-11-26 17:14:14 +01:00
2016-01-21 17:27:43 +01:00
2015-09-09 20:32:38 +02:00
2015-09-09 20:32:38 +02:00
2016-01-27 12:32:44 +01:00
2015-09-23 19:37:24 +02:00
2015-08-17 19:15:17 +02:00
2015-09-13 11:47:57 +02:00
2015-08-14 21:16:53 +02:00
2015-09-13 21:56:52 +02:00