]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 3 May 2013 21:13:06 +0000 (14:13 -0700)
committerMark Otto <otto@github.com>
Fri, 3 May 2013 21:13:06 +0000 (14:13 -0700)
commit7cceaa69560b22acac6297d21a2e2e752d667912
tree3a507c077f423755af371096d69409019a0e8cd7
parent14861e9cc32552ee235ceeb7b2bf0459d5298ea0
parentaa146582d6e4f23a36edf9bddb1570d16cd61f34
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip

Conflicts:
docs/docs.html
docs/assets/css/docs.css
docs/docs.html