Skip to content

Commit

Permalink
Merge pull request #10215 from XhmikosR/master
Browse files Browse the repository at this point in the history
Various
  • Loading branch information
mdo committed Aug 27, 2013
2 parents e97b8be + 2672857 commit b2b91a0
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 5 deletions.
Binary file modified assets/ico/apple-touch-icon-114-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/ico/apple-touch-icon-144-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/ico/apple-touch-icon-57-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/ico/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions assets/js/html5shiv.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions assets/js/respond.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"type": "git"
, "url": "https://github.com/twbs/bootstrap.git"
}
, "bugs": {
"url": "https://github.com/twbs/bootstrap/issues"
}
, "licenses": [
{
"type": "Apache-2.0"
Expand Down

0 comments on commit b2b91a0

Please sign in to comment.