Merge branch 'develop'

This commit is contained in:
Manuel Friedli 2014-01-13 11:11:44 +01:00
commit 388e0108e7
2 changed files with 2 additions and 2 deletions

View file

@ -15,7 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html manifest="manifest.appcache">
<head>
<title>Die Zeit als Wort - in HTML, CSS und JS</title>
<title>Die Zeit im Wort</title>
<script type="text/javascript" src="jquery-2.0.3.min.js"></script>
<script type="text/javascript" src="jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="jquery-cookie-1.4.0.js"></script>

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 4.0.0
# 4.0.1
COPYING
favicon.png