kikito affda6b4c5 merges master and fixes conflicts

2015-07-29 19:14:06 +02:00

..

comments

merges master and fixes conflicts

2015-07-29 17:13:09 +02:00

debates

merges master and fixes conflicts

2015-07-29 19:14:06 +02:00

devise

fixing conflicts [#45]

2015-07-29 13:36:48 +02:00

layouts

Adds new styles for debates show

2015-07-29 17:47:05 +02:00

shared

Changes tags styles

2015-07-29 17:45:43 +02:00

votes

merges master and fixes conflicts

2015-07-29 19:14:06 +02:00