diff options
| author | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
| commit | 8551f42ae2935c96bd37ae8ed15198a0cc22ede2 (patch) | |
| tree | 77498aad62c25da55fb121470d91623c14873f58 /docs/_data | |
| parent | b36d19c3c6caf89fbe996678bdefe3f7e9a69281 (diff) | |
| parent | 2cef0af211e8b6780fff90fe5f110493585aa97c (diff) | |
| download | bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.tar.xz bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.zip | |
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/core-team.yml | 19 | ||||
| -rw-r--r-- | docs/_data/sass-team.yml | 7 |
2 files changed, 26 insertions, 0 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml new file mode 100644 index 000000000..d1177964d --- /dev/null +++ b/docs/_data/core-team.yml @@ -0,0 +1,19 @@ +- name: Mark Otto + user: mdo + gravatar: bc4ab438f7a4ce1c406aadc688427f2c + +- name: Jacob Thornton + user: fat + gravatar: a98244cbdacaf1c0b55499466002f7a8 + +- name: Chris Rebert + user: cvrebert + gravatar: edec428c425453955f770095a7d26c50 + +- name: Julian Thilo + user: juthilo + gravatar: 0f7dd3ce58a416be5685ea6194f82b11 + +- name: XhmikosR + user: xhmikosr + gravatar: e37759b1ea0125d4e97b1e00b5eed26f diff --git a/docs/_data/sass-team.yml b/docs/_data/sass-team.yml new file mode 100644 index 000000000..9918e23ce --- /dev/null +++ b/docs/_data/sass-team.yml @@ -0,0 +1,7 @@ +- name: Thomas McDonald + user: thomas-mcdonald + gravatar: 24cd55ab1a62ffb113ab8c02f64c9301 + +- name: Gleb Mazovetskiy + user: glebm + gravatar: 729f685b8e8d7e9feed18c177c82e59b |