diff options
| author | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
| commit | 0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch) | |
| tree | 7188809b7c2194fc0aca9a65b7d07725ee4206d5 /docs/_data | |
| parent | 642fd5100293755a6003448d4a481f3b314edf15 (diff) | |
| parent | 1f148427de6d35a06e225deeee0b162b11955232 (diff) | |
| download | bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip | |
Merge branch 'master' into document_popover_focus
Conflicts:
docs/assets/js/docs.min.js
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/glyphicons.yml | 2 | ||||
| -rw-r--r-- | docs/_data/showcase.yml | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/docs/_data/glyphicons.yml b/docs/_data/glyphicons.yml index 80b4c9b08..fc4a8a58a 100644 --- a/docs/_data/glyphicons.yml +++ b/docs/_data/glyphicons.yml @@ -1,4 +1,4 @@ -# This file is generated via Grunt task. **Do not edit directly.** +# This file is generated via Grunt task. **Do not edit directly.** # See the 'build-glyphicons-data' task in Gruntfile.js. - glyphicon-asterisk diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml index 0c593fcc5..eb62dcc89 100644 --- a/docs/_data/showcase.yml +++ b/docs/_data/showcase.yml @@ -1,19 +1,19 @@ -- name: Coinbase - url: https://coinbase.com/ - expo_url: http://expo.getbootstrap.com/2013/08/06/coinbase/ - img: http://expo.getbootstrap.com/screenshots/coinbase.jpg +- name: Little + url: http://littleco.com + expo_url: http://expo.getbootstrap.com/2014/02/12/little/ + img: http://expo.getbootstrap.com/screenshots/little.jpg -- name: Localcrime - url: http://www.localcrimeapp.com/ - expo_url: http://expo.getbootstrap.com/2013/08/08/localcrime/ - img: http://expo.getbootstrap.com/screenshots/localcrime.jpg +- name: Engine Yard + url: http://engineyard.com + expo_url: http://expo.getbootstrap.com/2014/02/10/engine-yard/ + img: http://expo.getbootstrap.com/screenshots/engine-yard.jpg + +- name: Webflow + url: http://webflow.com + expo_url: http://expo.getbootstrap.com/2014/02/04/webflow/ + img: http://expo.getbootstrap.com/screenshots/webflow.jpg - name: Sentry - url: https://www.getsentry.com/ + url: https://getsentry.com expo_url: http://expo.getbootstrap.com/2013/05/09/sentry/ img: http://expo.getbootstrap.com/screenshots/sentry.jpg - -- name: Fortrabbit - url: http://fortrabbit.com/ - expo_url: http://expo.getbootstrap.com/2013/08/05/fortrabbit/ - img: http://expo.getbootstrap.com/screenshots/fortrabbit.jpg |