Merge branch 'master' of github.com:twbs/bootstrap

Conflicts: docs/assets/js/raw-files.min.js

Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: docs/assets/js/raw-files.min.js
f579b66b · Mark Otto · 12091b95 · 68b80836 · f579b66b
Commit f579b66b authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js