rgarcia 12d35085e0 fixing conflicts [#8]

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

..

debates

fixing conflicts [#8]

2015-07-18 17:30:31 +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

adds tag cloud [#8]

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

welcome

cherry picks capybara config [#5]

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