diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/_data | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/showcase.yml | 32 | ||||
| -rw-r--r-- | docs/_data/translations.yml | 4 |
2 files changed, 18 insertions, 18 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 diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index 08c0c3c01..5e5346b94 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -35,5 +35,5 @@ - name: Ukrainian code: uk - description: Bootstrap ua Українською - url: http://twbs.site-konstruktor.com.ua + description: Bootstrap українською + url: http://twbs.docs.org.ua |