diff options
| author | Mark Otto <[email protected]> | 2014-07-12 17:56:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-12 17:56:30 -0700 |
| commit | 4e55a867a02550030609dbf675aa1e00aeb92e9f (patch) | |
| tree | 84472f76afce83188f287c7993167e93e16ab1ea /docs/getting-started | |
| parent | 5cfde0d3a5819374e5f750b4fcfedfccc5c19889 (diff) | |
| parent | bb1286a0ab073bce1d18f704d7ac0545ea76c6ef (diff) | |
| download | bootstrap-4e55a867a02550030609dbf675aa1e00aeb92e9f.tar.xz bootstrap-4e55a867a02550030609dbf675aa1e00aeb92e9f.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_includes/components/alerts.html
docs/_includes/getting-started/browser-device-support.html
Diffstat (limited to 'docs/getting-started')
0 files changed, 0 insertions, 0 deletions