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

..

application.scss

Share in social networks

2015-08-10 11:00:39 -05:00

debates.scss

Merge branch 'master' into improving_debates

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

fonts.scss

Updates custom icons fonts

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

foundation_and_overrides.scss

configures foundation #2

2015-07-16 17:03:05 +02:00

icons.scss

Updates custom icons fonts

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

participacion.scss

Merge branch 'master' into improving_debates

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

variables.scss

Cleans style guide

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