]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into rtl_via_css_flip 12840/head
authorMark Otto <otto@github.com>
Tue, 4 Mar 2014 08:41:57 +0000 (00:41 -0800)
committerMark Otto <otto@github.com>
Tue, 4 Mar 2014 08:41:57 +0000 (00:41 -0800)
commitd6e07f045c2070f7b958a577549f7600ed45927b
treec23a4b3140e37c653737ec68178b136d93b88be1
parent477dc99ffa3a4a8c604e6fbbc4946ca2eb83ba01
parent1399497a02c6741c21a655b22a4ae71f8ed2b974
Merge branch 'master' into rtl_via_css_flip

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