rgarcia cc3f151914 fixing conflicts

2015-07-27 23:29:32 +02:00

..

comments

fixing conflicts

2015-07-27 23:29:32 +02:00

debates

fixing conflicts

2015-07-27 23:29:32 +02:00

devise

fixes specs

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

layouts

fixing conflicts

2015-07-27 23:29:32 +02:00

shared

fixing conflicts

2015-07-27 23:29:32 +02:00