Juanjo Bazán 984984473f Fix conflict

2015-07-18 21:58:43 +02:00

..

environments

adds devise configuration [#6]

2015-07-16 19:47:54 +02:00

initializers

configures act_as_taggable [#8]

2015-07-18 17:23:00 +02:00

locales

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

application.rb

makes default language spanish [#5]

2015-07-16 19:22:58 +02:00

boot.rb

initial commit

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

database.yml

initial commit

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

environment.rb

initial commit

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

routes.rb

Fix conflict

2015-07-18 21:58:43 +02:00

secrets.yml

initial commit

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