Merge branch 'develop' into 'master'

Develop
This commit is contained in:
Manuel Friedli 2014-04-22 20:52:16 +02:00
commit 7f86fa1a4a
1 changed files with 3 additions and 1 deletions

View File

@ -64,7 +64,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p><a href="..">Das interessiert mich nicht, ich will zurück zur grossen Uhr!</a></p>
<h2 id="the-clock">Die Uhr</h2>
<div id="uhr1"></div>
<a href="../">
<div id="uhr1"></div>
</a>
<h3 id="requirements">Benötigte Bibliotheken</h3>
<ul>
<li><a href="http://jquery.com/download/">jQuery</a> (getestet mit Version 2.1.0)</li>