Andy Miller 2c9ca7ac42 Merge branch 'feature/autoescape' into develop ...

# Conflicts:
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map

2016-04-11 17:26:02 -06:00

..

fonts.css

fix for lang alignment

2016-04-11 17:18:59 -06:00

fonts.css.map

fix for lang alignment

2016-04-11 17:18:59 -06:00

nucleus.css

fix for lang alignment

2016-04-11 17:18:59 -06:00

nucleus.css.map

fix for lang alignment

2016-04-11 17:18:59 -06:00

preset.css

fix for lang alignment

2016-04-11 17:18:59 -06:00

preset.css.map

fix for lang alignment

2016-04-11 17:18:59 -06:00

simple-fonts.css

fix for lang alignment

2016-04-11 17:18:59 -06:00

simple-fonts.css.map

fix for lang alignment

2016-04-11 17:18:59 -06:00

template.css

css sync

2016-04-11 17:24:13 -06:00

template.css.map

css sync

2016-04-11 17:24:13 -06:00