0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Mark Otto 4e55a867a0 Merge branch 'master' into derp
Conflicts:
	docs/_includes/components/alerts.html
	docs/_includes/getting-started/browser-device-support.html
2014-07-12 17:56:30 -07:00
..
2014-07-12 02:20:15 -07:00
2014-07-12 17:56:30 -07:00
2014-07-12 02:20:15 -07:00
2014-07-12 02:20:15 -07:00
2014-07-12 02:20:15 -07:00
2014-07-12 16:15:45 -07:00
2014-07-12 02:20:15 -07:00
2014-07-12 02:45:15 -07:00
2014-07-12 02:20:15 -07:00
2014-07-12 02:42:19 -07:00
2014-07-12 02:42:23 -07:00
2014-07-12 02:34:21 -07:00
2014-07-12 02:34:15 -07:00