yonote/yjs
14
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/extra/LICENSE.txt.html
View File

@@ -38,7 +38,11 @@
</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>

8
doc/extra/README.md.html
View File

@@ -70,7 +70,11 @@ But I would become really motivated if you gave me some feedback :) (<a href="ht
<ul>
<li>XML support</li>
</ul>
<<<<<<< HEAD
<h2 id="support">Support</h2><p>Please report any issues to the <a href="https://github.com/DadaMonad/Yatta/issues">Github issue page</a>!</p><h2 id="license">License</h2><p>Yatta! is licensed under the <a href="./LICENSE.txt">MIT License</a>.</p><a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#107;&#101;&#118;&#x69;&#110;&#x2e;&#x6a;&#97;&#x68;&#x6e;&#x73;&#x40;&#x72;&#x77;&#116;&#104;&#x2d;&#x61;&#x61;&#99;&#104;&#101;&#110;&#46;&#100;&#101;">&#107;&#101;&#118;&#x69;&#110;&#x2e;&#x6a;&#97;&#x68;&#x6e;&#x73;&#x40;&#x72;&#x77;&#116;&#104;&#x2d;&#x61;&#x61;&#99;&#104;&#101;&#110;&#46;&#100;&#101;</a>
=======
<h2 id="support">Support</h2><p>Please report any issues to the <a href="https://github.com/DadaMonad/Yatta/issues">Github issue page</a>!</p><h2 id="license">License</h2><p>Yatta! is licensed under the <a href="./LICENSE.txt">MIT License</a>.</p><a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#107;&#x65;&#x76;&#x69;&#x6e;&#x2e;&#x6a;&#x61;&#x68;&#x6e;&#115;&#x40;&#114;&#x77;&#x74;&#x68;&#x2d;&#x61;&#x61;&#99;&#104;&#x65;&#x6e;&#x2e;&#x64;&#x65;">&#107;&#x65;&#x76;&#x69;&#x6e;&#x2e;&#x6a;&#x61;&#x68;&#x6e;&#115;&#x40;&#114;&#x77;&#x74;&#x68;&#x2d;&#x61;&#x61;&#99;&#104;&#x65;&#x6e;&#x2e;&#x64;&#x65;</a>
>>>>>>> XML-Support
@@ -79,7 +83,11 @@ But I would become really motivated if you gave me some feedback :) (<a href="ht
</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>