Merge remote-tracking branch 'www.mikescher.de/master'
Conflicts: www/protected/views/msmain/admin.php
This commit is contained in:
@@ -88,6 +88,7 @@ $this->breadcrumbs =
|
||||
</div>
|
||||
|
||||
<div class="well well-small">
|
||||
|
||||
<h2>Program of the day</h2>
|
||||
<hr>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user