rgarcia cd2d05e0c5 fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

..

account

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

comments

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

debates

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

devise

fixing conflicts [#45]

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

layouts

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

shared

Changes tags styles

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

votes

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00