diff options
| author | Mark Otto <[email protected]> | 2012-07-17 20:57:20 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-17 20:57:20 -0700 |
| commit | a1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc (patch) | |
| tree | 64aa65e12bba037f61c34b11b5d8ff4cc94658b6 /docs/templates | |
| parent | 62f6368344cd4d76eb7e10be209f9fe62e4456cf (diff) | |
| parent | 426e7d9fbd87421e56a76e17a19de97a6e08c460 (diff) | |
| download | bootstrap-a1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc.tar.xz bootstrap-a1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc.zip | |
Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts:
docs/extend.html
docs/templates/pages/extend.mustache
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/extend.mustache | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index d7384d58a..508bd7e15 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -88,7 +88,7 @@ <h3>{{_i}}Unofficial Mac app{{/i}}</h3> <p>{{_i}}<a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file. If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}</p> - <h3>{{_i}}More Mac apps{{/i}}</h3> + <h3>{{_i}}More apps{{/i}}</h3> <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4> <p>{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}</p> <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4> @@ -166,4 +166,5 @@ </div>{{! /span9 }} </div>{{! row}} + </div>{{! /container }} |