Mark Otto 31956be6ef Merge branch 'master' into icon_paths ...

Conflicts:
	dist/css/bootstrap-rtl.css
	dist/css/bootstrap.css.map
	dist/js/bootstrap.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/js/bootstrap.min.js

2014-05-12 19:57:49 -07:00

..

_data

#12790: Add link to unofficial Italian translation

2014-04-06 02:21:44 +02:00

_includes

nuke the rtl docs

2014-05-12 19:55:58 -07:00

_jade

Fix #13138: use underscore prefix to ignore directories

2014-03-24 21:47:59 +01:00

_layouts

Rename and organize nav partials for cleaner file structure

2014-03-16 19:32:08 -07:00

assets

grunt

2014-05-12 19:53:12 -07:00

dist

Merge branch 'master' into icon_paths

2014-05-12 19:57:49 -07:00

examples

nuke the rtl example

2014-05-12 19:56:29 -07:00

about.html

add svg logos to brand guidelines

2014-03-04 13:32:02 -08:00

browser-bugs.html

Wall of browser bugs: formatting tweaks

2014-05-03 23:40:18 -07:00

components.html

Break up docs into includes

2014-03-16 19:03:53 -07:00

css.html

move rtl to getting started, per @cvrebert's feedback

2014-05-07 15:30:27 -07:00

customize.html

Customizer: make utilities.less inclusion mandatory

2014-05-08 16:49:19 -07:00

getting-started.html

nuke the rtl docs

2014-05-12 19:55:58 -07:00

index.html

Re-implement Universal Analytics

2014-04-04 10:28:45 +02:00

javascript.html

Separate JS includes for alerts and popovers

2014-03-17 15:58:03 +01:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

2014-01-14 13:47:18 +01:00

migration.html

FIX: #13355. Added .navbar-nav to migration change list.

2014-04-17 21:35:55 -05:00

robots.txt

Add sitemap.xml and robots.txt files.

2014-02-27 17:05:52 +02:00

sitemap.xml

Add missing blank line

2014-03-15 22:40:51 +01:00