Juanjo Bazán 7e1cd2940d Fix conflicts

2015-08-17 21:08:15 +02:00

..

acts_as_taggable_on.rb

removes deprecation method call

2015-07-29 13:57:56 +02:00

ahoy.rb

Save visitor ip

2015-08-08 12:23:28 +02:00

assets.rb

initial commit

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

backtrace_silencers.rb

initial commit

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

cookies_serializer.rb

initial commit

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

devise.rb

adds fixes for staging deploys

2015-08-14 18:09:05 +02:00

filter_parameter_logging.rb

initial commit

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

inflections.rb

initial commit

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

kaminari_config.rb

adds kaminari config file

2015-08-17 17:03:48 +02:00

mime_types.rb

initial commit

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

session_store.rb

initial commit

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

simple_captcha.rb

uses simple_captcha instead of recaptcha [#51]

2015-08-10 20:24:56 +02:00

social_share_button.rb

Share in social networks

2015-08-10 11:00:39 -05:00

vote_extensions.rb

refactors voted debates

2015-08-15 14:57:41 +02:00

wrap_parameters.rb

initial commit

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