Juanjo Bazán 984984473f Fix conflict

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

..

concerns

initial commit

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

.keep

initial commit

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

comment.rb

uses new hash syntax by default

2015-07-18 21:49:36 +02:00

debate.rb

removes empty % sign when there are no votes

2015-07-18 21:27:56 +02:00

user.rb

removes unused association [#11]

2015-07-18 17:20:30 +02:00

vote.rb

adds votes feature specs [#9]

2015-07-18 18:10:36 +02:00