Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Conflicts: index.html
This commit is contained in:
commit
3b375ee191
@ -140,4 +140,4 @@
|
||||
<textarea id="wmd-input"></textarea>
|
||||
<div id="wmd-preview" class="well"></div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
Loading…
Reference in New Issue
Block a user