diff options
| author | Mark Otto <[email protected]> | 2015-01-21 20:16:08 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-21 20:16:08 -0800 |
| commit | a3890a72cfce45265028413b2e6677b968bdc6a5 (patch) | |
| tree | 82d322a95d2f709792c2ec69526a522ee9618907 /docs/_data | |
| parent | 53d2abff922ad1ca776750657d98415a6fedb635 (diff) | |
| parent | c64c8636376af76acd01f132203af162fafb39bc (diff) | |
| download | bootstrap-a3890a72cfce45265028413b2e6677b968bdc6a5.tar.xz bootstrap-a3890a72cfce45265028413b2e6677b968bdc6a5.zip | |
Merge branch 'master' into move-inline-css
Conflicts:
docs/assets/css/docs.min.css
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/glyphicons.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/_data/glyphicons.yml b/docs/_data/glyphicons.yml index ade750912..338e99398 100644 --- a/docs/_data/glyphicons.yml +++ b/docs/_data/glyphicons.yml @@ -227,8 +227,12 @@ - glyphicon-piggy-bank - glyphicon-scissors - glyphicon-bitcoin +- glyphicon-btc +- glyphicon-xbt - glyphicon-yen +- glyphicon-jpy - glyphicon-ruble +- glyphicon-rub - glyphicon-scale - glyphicon-ice-lolly - glyphicon-ice-lolly-tasted |