diff options
| author | Jacob Thornton <[email protected]> | 2011-09-08 19:13:26 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-08 19:13:26 -0700 |
| commit | 346122a0c7a883f1fcc1887899cf8bb37274c7f9 (patch) | |
| tree | c889cf926885305343e3e93b0768c45489a1f251 /Makefile | |
| parent | 8d2f14d8d0bfef3b472be7b7770177fad26d5068 (diff) | |
| parent | c474f996a902434572c238bb6e170473171cadad (diff) | |
| download | bootstrap-346122a0c7a883f1fcc1887899cf8bb37274c7f9.tar.xz bootstrap-346122a0c7a883f1fcc1887899cf8bb37274c7f9.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.2.0.css -BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css +BOOTSTRAP = ./bootstrap-1.3.0.css +BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` |