yonote/yjs
15
0
Fork 0
Code Pull Requests 1 Releases Activity

merge

Browse Source
This commit is contained in:
Kevin Jahns
2014-10-06 14:19:56 +02:00
parent 693f9bab67 98e582c413
commit d2f16eaa87
62 changed files with 2357 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/class/XmlFramework.html
View File

@@ -303,7 +303,11 @@ JsonFramework was initialized (Depending on the HistoryBuffer implementation).</
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>