rgarcia 75f1638cd6 fixing conflicts [#6]

2015-07-16 21:29:44 +02:00

..

debate_spec.rb

adds debate model specs [#5]

2015-07-16 19:26:17 +02:00

user_spec.rb

adds devise configuration [#6]

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