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

..

assets

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

controllers

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

helpers

Merge pull request #830 from AjuntamentdeBarcelona/feature_flags

2016-01-18 15:19:09 +01:00

mailers

Store locale in a user's field and switch locale on mailers

2016-01-22 18:10:28 +01:00

models

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

views

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00