kikito ae98ba3572 merges master and fixes conflicts

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

..

assets

merges master and fixes conflicts

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

controllers

merges master and fixes conflicts

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

helpers

Refactor debates order select using js-location-changer

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

mailers

adds email verification

2015-08-27 23:57:04 +02:00

models

fixes failing specs

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

views

merges master and fixes conflicts

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