Merge branch 'glyphicons_font' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/assets/css/docs.css less/sprites.less
Showing
File added
File added
File added
File added
8.57 KB
12.5 KB
File added
File added
File added
File added
8.57 KB
12.5 KB
less/glyphicons.less
0 → 100644
less/sprites.less
deleted
100644 → 0