]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6506ede 839ef3a)
Merge branch '2.0.3-wip'
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Apr 2012 09:21:45 +0000 (02:21 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Apr 2012 09:21:45 +0000 (02:21 -0700)
Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
index ec442c2c42856a6082afb3b6c0735ff709000e2f,ea9d3a3f99fbe24b26a6266f747bc0537c3f886c..827b6920ec83f9da4c49d9f35b5d8bd3619ab537
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -60,4 -91,4 +91,4 @@@ watch
        watchr -e "watch('less/.*\.less') { system 'make' }"
  
  
--.PHONY: docs watch gh-pages
++.PHONY: docs watch gh-pages
Mirror of https://github.com/twbs/bootstrap.git