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

..

fonts

Updates custom icons fonts

2015-08-15 00:56:58 +02:00

images

Merge branch 'master' into improving_debates

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

javascripts

removes comment

2015-08-14 23:41:00 +02:00

stylesheets

Merge branch 'master' into improving_debates

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