Merge branch 'master' of git://fiktivkod.org/fiktivkod
This commit is contained in:
commit
770a4055a0
3 changed files with 19 additions and 12 deletions
|
|
@ -7,7 +7,7 @@
|
|||
<link rel="stylesheet" type="text/css" href="<?=$this->baseUrl()?>/css/reset.css" media="screen" />
|
||||
<link rel="stylesheet" type="text/css" href="<?=$this->baseUrl()?>/css/default.css" media="screen" />
|
||||
<?=$this->headScript() ?>
|
||||
<script type="text/javascript" src="http://localhost/fiktivkod/js/menu.js"></script>
|
||||
<script type="text/javascript" src="<?=$this->baseUrl()?>/js/menu.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper" class="small">
|
||||
|
|
@ -37,4 +37,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
Reference in a new issue