rgarcia 28e36b76e2 fixing conflicts [#7]

2015-07-18 18:04:23 +02:00

..

comments

adds comments to debates [#7]

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

debates

fixing conflicts [#7]

2015-07-18 18:04:23 +02:00

devise

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

layouts

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

shared

sanitises tag names [#8]

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

welcome

cherry picks capybara config [#5]

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