Alberto Garcia Cabeza 9f8229465c fixes conflicts

2015-08-17 21:36:06 +02:00

..

admin.scss

Creates SCSS for admin

2015-08-17 21:30:07 +02:00

application.scss

Creates SCSS for admin

2015-08-17 21:30:07 +02:00

debates.scss

Merge branch 'master' into titles_and_filters

2015-08-17 14:53:48 +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 font

2015-08-17 21:29:44 +02:00

participacion.scss

Merge pull request #187 from AyuntamientoMadrid/titles_and_filters

2015-08-17 20:00:05 +02:00

variables.scss

Cleans style guide

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