kikito b87331c958 merges master and fixes conflicts

2015-07-29 13:00:33 +02:00

..

comments

Adds classes to several buttons so they don't look ugly

2015-07-29 12:54:51 +02:00

debates

merges master and fixes conflicts

2015-07-29 13:00:33 +02:00

devise

merges master and fixes conflicts

2015-07-29 13:00:33 +02:00

layouts

adds i18n to header

2015-07-28 18:49:41 +02:00

shared

displays captcha only on new, not edit

2015-07-28 12:39:39 +02:00