resolving merge

This commit is contained in:
Jeremy Ashkenas
2011-04-27 21:19:02 -04:00
2 changed files with 14 additions and 0 deletions

BIN
docs/images/flow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

View File

@@ -272,6 +272,7 @@
<li> <a href="#examples-todos">Todos</a></li>
<li> <a href="#examples-documentcloud">DocumentCloud</a></li>
<li> <a href="#examples-basecamp">Basecamp Mobile</a></li>
<li> <a href="#examples-flow">Flow</a></li>
<li> <a href="#examples-cloudapp">CloudApp</a></li>
<li> <a href="#examples-soundcloud">Mobile SoundCloud</a></li>
<li> <a href="#examples-tilemill">TileMill</a></li>
@@ -1853,6 +1854,19 @@ var DocumentView = Backbone.View.extend({
</a>
</div>
<p id="examples-flow">
<a href="http://www.metalabdesign.com/">MetaLab</a> used Backbone.js to create
<a href="http://www.getflow.com/">Flow</a>, a task management app for teams. The
workspace relies on Backbone.js to construct task views, activities, accounts,
folders, projects, and tags. You can see the internals under <tt>window.Flow</tt>.
</p>
<div style="text-align: center;">
<a href="http://www.getflow.com/">
<img src="docs/images/flow.png" alt="Flow" class="example_image" />
</a>
</div>
<p id="examples-cloudapp">
<a href="http://getcloudapp.com">CloudApp</a> is simple file and link
sharing for the Mac. Backbone.js powers the web tools