Andy Miller aad914eb2b Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop ...

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

2016-04-19 12:35:05 -06:00

..

fonts.css

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

fonts.css.map

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

nucleus.css

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

nucleus.css.map

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

preset.css

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

preset.css.map

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

simple-fonts.css

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

simple-fonts.css.map

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

template.css

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00

template.css.map

Removed physical fonts, moved back to google fonts for space

2016-04-19 11:56:03 -06:00