Skip to main content

Browse the archive

Revision 31c1eba51bf3f5a988e7bef9da88372e673c30c2 authored by fat on 30 October 2012, 04:28:17 UTC, committed by fat on 30 October 2012, 04:28:17 UTC 
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
 
Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.min.css
2 parent s 92e7f16 + 41ad16f
Raw File
.gitignore 
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.zip
*.vi
*~
*.sass-cache

# OS or Editor folders
.DS_Store
._*
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
*.sublime-project
*.sublime-workspace

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
.idea
node_modules
dist
back to top