]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into move-inline-css
authorMark Otto <markdotto@gmail.com>
Thu, 22 Jan 2015 04:16:08 +0000 (20:16 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 22 Jan 2015 04:16:08 +0000 (20:16 -0800)
commita3890a72cfce45265028413b2e6677b968bdc6a5
tree82d322a95d2f709792c2ec69526a522ee9618907
parent53d2abff922ad1ca776750657d98415a6fedb635
parentc64c8636376af76acd01f132203af162fafb39bc
Merge branch 'master' into move-inline-css

Conflicts:
docs/assets/css/docs.min.css
docs/assets/css/docs.min.css
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css