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

..

administrator.rb

removes before_action in favor of cancancan

2016-01-13 12:56:27 +01:00

common.rb

adding suggest with coffescript

2016-01-27 12:32:44 +01:00

everyone.rb

uses geozones instead of district tags

2016-01-25 22:28:46 +01:00

moderation.rb

Splits ability.rb and specs into several smaller files

2015-09-28 13:51:42 +02:00

moderator.rb

Splits ability.rb and specs into several smaller files

2015-09-28 13:51:42 +02:00