kikito c495d4678c merges master and fixes conflicts

2015-07-29 17:13:09 +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 17:13:09 +02:00

devise

fixing conflicts [#45]

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

layouts

removes hashrockets

2015-07-29 14:27:58 +02:00

shared

refactors recaptchable helper [#45]

2015-07-28 18:32:45 +02:00

votes

merges master and fixes conflicts

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