diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/_data/showcase.yml | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/_data/showcase.yml')
| -rw-r--r-- | docs/_data/showcase.yml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml index eb62dcc89..c01579c0a 100644 --- a/docs/_data/showcase.yml +++ b/docs/_data/showcase.yml @@ -1,19 +1,19 @@ -- 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: Red Antler + url: http://www.redantler.com/ + expo_url: http://expo.getbootstrap.com/2014/02/24/redantler/ + img: redantler -- 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: Riot Design + url: http://riotdesign.eu/en/ + expo_url: http://expo.getbootstrap.com/2014/03/13/riot-design/ + img: riot -- 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: Newsweek + url: http://www.newsweek.com/ + expo_url: http://expo.getbootstrap.com/2014/02/12/newsweek/ + img: newsweek -- name: Sentry - url: https://getsentry.com - expo_url: http://expo.getbootstrap.com/2013/05/09/sentry/ - img: http://expo.getbootstrap.com/screenshots/sentry.jpg +- name: Robinhood + url: https://www.robinhood.com + expo_url: http://expo.getbootstrap.com/2014/02/26/robinhood/ + img: robinhood |