rgarcia 75f1638cd6 fixing conflicts [#6]

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

..

debates

Basic CRU operations [#5]

2015-07-16 19:22:20 +02:00

devise

adds devise configuration [#6]

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

layouts

fixing conflicts [#6]

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

welcome

cherry picks capybara config [#5]

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