Alberto Garcia Cabeza 09d71ad84f Merge branch 'master' into improving_debates ...

Conflicts:
	app/assets/stylesheets/debates.scss
	app/assets/stylesheets/participacion.scss

2015-08-15 01:45:56 +02:00

..

_debate.html.erb

Limiting max number of tags shown on debate cards ~ issue#144

2015-08-12 16:26:41 +02:00

_form.html.erb

Improves styles for simple captcha

2015-08-15 01:05:00 +02:00

_votes.html.erb

add vote counters to comments

2015-08-12 14:59:21 +02:00

edit.html.erb

adds i18n to debates' interface

2015-07-28 16:48:36 +02:00

index.html.erb

Modifies styles welcome and debates index

2015-08-12 15:27:28 +02:00

new.html.erb

Adds styles for debate new

2015-08-06 17:59:22 +02:00

show.html.erb

Merge branch 'master' into improving_debates

2015-08-15 01:45:56 +02:00

vote.js.erb

fixes conflicts

2015-08-06 13:42:57 +02:00