]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into carousel-glyphicons-mainstream
authorMark Otto <otto@github.com>
Wed, 4 Sep 2013 01:43:42 +0000 (18:43 -0700)
committerMark Otto <otto@github.com>
Wed, 4 Sep 2013 01:43:42 +0000 (18:43 -0700)
commitdcdafa422057863aea3e328e1d86ee25eda7e37b
treeaf4a454f00359508012f40e7d560575c74381faa
parent73e4b817905145a965797c4ac026eae94f698141
parent72b1f69bfc77c3ad792e4c297ae239b6b86fd42f
Merge branch 'master' into carousel-glyphicons-mainstream

Conflicts:
javascript.html
javascript.html