Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed merge conflicts

  • Loading branch information...
commit b79819ad544193e50f8099fdd0ab36a692c45435 2 parents 4647204 + b23282f
Hay Kranen authored

Showing 2 changed files with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. +1 2  README.md
  2. +1 1  index.html
3  README.md
Source Rendered
@@ -3,5 +3,4 @@
3 3
4 4 Full documentation available here:
5 5
6   -[http://hay.github.com/stapes/](http://hay.github.com/stapes/)
7   -
  6 +[http://hay.github.com/stapes/](http://hay.github.com/stapes/)
2  index.html
@@ -76,7 +76,6 @@ <h3 id="m-phil">Philosophy</h3>
76 76 <li><a href="#m-plugins">A simple mechanism</a> for writing plugins and extensions to extend the functionality of Stapes.</li>
77 77 <li>Nice extensive documentation with lots of examples (you're reading that right now ;)</li>
78 78 <li>Optimized to use Ecmascript 5 features when they're available in the browser.</li>
79   - <li>Compatible with IE6+, Chrome, Firefox, Safari, Opera, Android and iOS browsers</li>
80 79 </ul>
81 80
82 81 <p><em>But what about templating, persistence, routing, history management, etc?</em></p>
@@ -234,6 +233,7 @@ <h3 id="m-general">General methods</h3>
234 233 <h1>extend</h1>
235 234
236 235 <h2>module.extend([context, ]object)</h2>
  236 +
237 237 <h2>Stapes.extend( object )</h2>
238 238
239 239 <p>Extend your module by giving an

0 comments on commit b79819a

Please sign in to comment.
Something went wrong with that request. Please try again.