diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-02 09:42:51 +0100 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-02 09:42:51 +0100 |
| commit | 13418ac9e709c85cfbaba501efb69c8bdff7ddd4 (patch) | |
| tree | e148a9d633a6d3832be7746d182d3798d64f4cb8 /default | |
| parent | 939372574745e895c172f21e1fe3994946fbf760 (diff) | |
| parent | 9f0a62f7c12c8b91cef0df8189db38711838a051 (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
component.json
package.json
Diffstat (limited to 'default')
| -rw-r--r-- | default/bootstrap-responsive.css | 2 | ||||
| -rw-r--r-- | default/bootstrap-responsive.min.css | 2 | ||||
| -rw-r--r-- | default/bootstrap.css | 2 | ||||
| -rw-r--r-- | default/bootstrap.min.css | 2 | ||||
| -rwxr-xr-x | default/index.html | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/default/bootstrap-responsive.css b/default/bootstrap-responsive.css index 5215a5d0..fcd72f7a 100644 --- a/default/bootstrap-responsive.css +++ b/default/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.0 + * Bootstrap Responsive v2.3.1 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/default/bootstrap-responsive.min.css b/default/bootstrap-responsive.min.css index 05978601..d1b7f4b0 100644 --- a/default/bootstrap-responsive.min.css +++ b/default/bootstrap-responsive.min.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.0 + * Bootstrap Responsive v2.3.1 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/default/bootstrap.css b/default/bootstrap.css index b2550569..2f56af33 100644 --- a/default/bootstrap.css +++ b/default/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.0 + * Bootstrap v2.3.1 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/default/bootstrap.min.css b/default/bootstrap.min.css index fd5ed734..c10c7f41 100644 --- a/default/bootstrap.min.css +++ b/default/bootstrap.min.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.0 + * Bootstrap v2.3.1 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/default/index.html b/default/index.html index 932ad98e..5691df5b 100755 --- a/default/index.html +++ b/default/index.html @@ -889,7 +889,7 @@ <!-- Le javascript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script> + <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> <script src="../js/bootstrap.min.js"></script> <script src="../js/bootswatch.js"></script> |