aboutsummaryrefslogtreecommitdiff
path: root/bower.json
diff options
context:
space:
mode:
authorfat <[email protected]>2013-12-24 12:35:24 -0800
committerfat <[email protected]>2013-12-24 12:35:24 -0800
commit558b6a478d6dfdc5a8ee579c93d1080b553ac9a0 (patch)
tree4739563ddfbd59ed5fc49dd9bdd736cf1fbe93e7 /bower.json
parent50bd4edb8c2f498ac10a07250c57570489c427b0 (diff)
parent1da3a8c6b131102f7e04a08f15783ca596634694 (diff)
downloadbootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.tar.xz
bootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.zip
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: dist/js/bootstrap.min.js docs-assets/js/raw-files.js
Diffstat (limited to 'bower.json')
-rw-r--r--bower.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json
index b29c2702b..237f8e9ba 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
- "version": "3.1.0",
+ "version": "3.0.3",
"main": [
"./dist/css/bootstrap.css",
"./dist/js/bootstrap.js",