rgarcia fce0068bf4 fixing conflicts [#7]

2015-07-18 17:40:38 +02:00

..

comments

adds comments to debates [#7]

2015-07-18 17:38:57 +02:00

debates

fixing conflicts [#7]

2015-07-18 17:40:38 +02:00

devise

adds first name and last name to users

2015-07-18 14:47:04 +02:00

layouts

adds user menu

2015-07-18 14:47:04 +02:00

welcome

cherry picks capybara config [#5]

2015-07-16 19:16:04 +02:00