Alberto Miedes Garcés 5d9054d284 Merge branch 'master' into api-dev-PRs ...

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

2017-05-11 21:59:42 +02:00

..

deploy

removes capistrano template configuration

2017-05-04 01:21:08 +02:00

environments

adds consistency to ruby code style

2016-11-15 11:18:43 +01:00

initializers

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

locales

removes bold on links and make consistent text

2017-05-11 17:24:39 +02:00

api.yml

Fix buggy associations

2017-01-27 14:27:28 +01:00

application_custom.rb

Custom folder structure: initial documentation, code and structure folders

2016-05-31 19:57:29 +02:00

application.rb

First working version of new GraphQL::TypeCreator after major refactoring

2016-11-10 20:53:15 +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 references to Madrid

2016-07-05 13:47:14 +02:00

deploy.rb

updates capistrano

2017-05-01 12:20:52 +02:00

environment.rb

initial commit

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

i18n-tasks.yml

Merge branch 'master' into site-customization

2017-04-07 17:29:33 +02:00

newrelic.yml

changes 'participacion' to 'consul' in config

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

routes.rb

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

schedule.rb

generate a new sitemap everyday at 5:00am

2016-12-02 11:30:57 +01:00

secrets.yml.example

Adds Tolk gem for i18n web interface

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

sitemap.rb

changes page paths on sitemap.rb

2017-04-27 16:37:41 +02:00