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

..

assets

Merge branch 'master' into improving_debates

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

controllers

adds admin layout and access links [#163]

2015-08-14 12:37:44 +02:00

helpers

use initialjs-rails instead our own copy of initial.js and view helper

2015-08-14 21:16:53 +02:00

mailers

sends emails [#23]

2015-08-07 20:52:53 +02:00

models

clean up tags_count_out_of_limit

2015-08-12 17:34:04 +02:00

views

Merge branch 'master' into improving_debates

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