kikito ae98ba3572 merges master and fixes conflicts

2015-08-28 19:57:28 +02:00

..

fonts

Updates custom icons font

2015-08-26 19:06:12 +02:00

images

Adds styles to comment and reply emails

2015-08-26 18:51:29 +02:00

javascripts

Refactor debates order select using js-location-changer

2015-08-28 17:17:21 +02:00

stylesheets

merges master and fixes conflicts

2015-08-28 19:57:28 +02:00