Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
This commit is contained in:
naomiaro 2011-01-06 01:05:34 -05:00
commit d9e8e1641a
76 changed files with 238 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/layouts/scripts/layout.phtml
View file

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Campcaster</title>
<title>Airtime</title>
<?php echo $this->headScript() ?>
<?php echo $this->headLink() ?>
</head>

2
application/layouts/scripts/library.phtml
View file

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Campcaster</title>
<title>Airtime</title>
<?php echo $this->headScript() ?>
<?php echo $this->headLink() ?>
</head>

2
application/layouts/scripts/login.phtml
View file

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Campcaster</title>
<title>Airtime</title>
<?php echo $this->headScript() ?>
<?php echo $this->headLink() ?>
</head>

2
application/layouts/scripts/search.phtml
View file

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Campcaster</title>
<title>Airtime</title>
<?php echo $this->headScript() ?>
<?php echo $this->headLink() ?>
</head>