rgarcia 75f1638cd6 fixing conflicts [#6]

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

..

20150715190041_create_debates.rb

adds debate model

2015-07-15 21:07:15 +02:00

20150716154501_remove_external_link_from_debates.rb

removes unused column [#5]

2015-07-16 19:24:27 +02:00

20150716174358_devise_create_users.rb

adds devise configuration [#6]

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