diff options
| author | Mark Otto <[email protected]> | 2012-11-03 13:44:01 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-03 13:44:01 -0700 |
| commit | a249d1c8ee597c4f0f29da55b15cf35accd4221c (patch) | |
| tree | efc755be687dab37f3298c76d4be1649bfe5dec6 /docs/assets/js | |
| parent | 1477e081d46ebf6a5e6acb06debb7edb1a324918 (diff) | |
| parent | 5d6cf2ee1939515ad41b052ed1c406f96274ea37 (diff) | |
| download | bootstrap-a249d1c8ee597c4f0f29da55b15cf35accd4221c.tar.xz bootstrap-a249d1c8ee597c4f0f29da55b15cf35accd4221c.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'docs/assets/js')
| -rw-r--r-- | docs/assets/js/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/README.md b/docs/assets/js/README.md index b58fa1d40..66903c71a 100644 --- a/docs/assets/js/README.md +++ b/docs/assets/js/README.md @@ -17,7 +17,7 @@ To target a specific plugin, just include the plugins name as a namespace along --- -### PROGRAMATIC API +### PROGRAMMATIC API We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API. |