Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
martin 2011-09-13 14:56:48 -04:00
commit 9fc2932be6
21 changed files with 2120 additions and 88 deletions

View file

@ -1,11 +1,11 @@
<div class="login_box">
<div class="logobox">&nbsp;</div>
<h2>Login</h2>
<div id="login" class="login-content clearfix">
<p class="light"><?php echo $this->message; ?></p>
<?php echo $this->form; ?>
</div>
<div class="logobox">&nbsp;</div>
<h2>Login</h2>
<div id="login" class="login-content clearfix">
<p class="light"><?php echo $this->message; ?></p>
<?php echo $this->form; ?>
</div>
</div>
<div class="footer"> Airtime&nbsp;<?php echo $this->airtimeVersion ?>&nbsp;Copyright &copy; Sourcefabric o.p.s <?php echo $this->airtimeCopyright ?>. All rights reserved.<br/>
Maintained and distributed under GNU GPL v.3 by <a href="http://www.sourcefabric.org"> Sourcefabric o.p.s </a> </div>