Mark Otto a3be713f8f Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext ... Conflicts: dist/css/bootstrap.min.css		2013-08-02 19:30:03 -07:00
..
css	Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext	2013-08-02 19:30:03 -07:00
js	fixes #8957	2013-08-02 15:13:12 -07:00