diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /docs/_data | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/core-team.yml | 4 | ||||
| -rw-r--r-- | docs/_data/translations.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml index d1177964d..b9e67f230 100644 --- a/docs/_data/core-team.yml +++ b/docs/_data/core-team.yml @@ -17,3 +17,7 @@ - name: XhmikosR user: xhmikosr gravatar: e37759b1ea0125d4e97b1e00b5eed26f + +- name: Heinrich Fenkart + user: hnrch02 + gravatar: 0d53f5d3d3d28bd470f394d98f7ef48f 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 |