aboutsummaryrefslogtreecommitdiff
path: root/_data
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-22 21:23:24 -0800
committerMark Otto <[email protected]>2013-12-22 21:23:24 -0800
commit906b0c595bb9f02bdb305888804faf277602a0c1 (patch)
treed4a91193efb42ba5b265c32ff0bbef6c40ec1367 /_data
parentc66924cc1ba7c1031818aceb8cd126a68a700bcf (diff)
parentcb7cdd0c0565f2872ef46fdc55b956aeb270e346 (diff)
downloadbootstrap-906b0c595bb9f02bdb305888804faf277602a0c1.tar.xz
bootstrap-906b0c595bb9f02bdb305888804faf277602a0c1.zip
Merge branch 'master' into sass_docs
Diffstat (limited to '_data')
-rw-r--r--_data/glyphicons.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/_data/glyphicons.yml b/_data/glyphicons.yml
index a894f8bf6..80b4c9b08 100644
--- a/_data/glyphicons.yml
+++ b/_data/glyphicons.yml
@@ -1,6 +1,5 @@
-# Generated on Wed Dec 18 2013 20:14:37 GMT-0800 (PST)
-# **Don't edit this directly!**
-# Look at the 'build-glyphicons-data' task in Gruntfile.js
+# This file is generated via Grunt task. **Do not edit directly.**
+# See the 'build-glyphicons-data' task in Gruntfile.js.
- glyphicon-asterisk
- glyphicon-plus