Fernando Seror c4eb29f99d Merge branch 'master' into escoger_idioma_803 ...

Conflicts:
	app/controllers/application_controller.rb

2015-08-05 15:47:52 -05:00

..

environments

fixes build

2015-07-31 14:54:49 +02:00

initializers

Allow locale to be set through the front-end

2015-08-05 15:43:39 -05:00

locales

hides comment forms from not logged users

2015-08-05 14:12:58 +02:00

application.rb

moves wysiwyg sanitizer to lib [#71]

2015-07-31 18:51:20 +02:00

boot.rb

initial commit

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

database.yml.example

removes db name from defaults

2015-07-24 12:51:28 +02:00

environment.rb

initial commit

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

routes.rb

fixes conflicts with master [#25]

2015-08-05 13:47:23 +02:00

secrets.yml.example

fixes key name

2015-07-27 18:48:30 +02:00