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

..

deploy

Allows deploying branches in preproduction

2016-01-26 18:10:51 +01:00

environments

removes unique language for production env

2015-11-10 10:57:39 +01:00

initializers

requests omniauth facebook email

2016-01-26 18:15:39 +01:00

locales

Merge branch 'suggest_before_creating'

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

application.rb

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

boot.rb

initial commit

2015-07-15 13:32:13 +02:00

database.yml.example

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

deploy-secrets.yml.example

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

deploy.rb

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

environment.rb

initial commit

2015-07-15 13:32:13 +02:00

i18n-tasks.yml

lists dynamic keys as ignore_unused in i18n-tasks

2016-01-25 14:59:37 +01:00

newrelic.yml

changes 'participacion' to 'consul' in config

2015-11-23 14:10:46 +01:00

routes.rb

Merge branch 'suggest_before_creating'

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

schedule.rb

adds a dummy task to schedule.rb

2015-09-12 08:45:00 +02:00

secrets.yml.example

Adds Tolk gem for i18n web interface

2016-01-14 14:57:06 +01:00