diff options
| author | MaZderMind | 2014-12-27 16:19:13 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-27 16:19:13 +0100 |
| commit | ab0a2cfbf2b4be1d87376052a02ef2e67557bf0b (patch) | |
| tree | 2e0d0ac51cfc44aac6483669d009c29ca29c96ff /template/assemblies/program.phtml | |
| parent | 696066a2df58fa12bfbdac427a767efdb4fe00a4 (diff) | |
| parent | 03d3f65e9cdc7100628fb8dde20f97f503e09c57 (diff) | |
Merge branch 'master' into relivew
Conflicts:
31c3/assets/css/lustige-styles.css.map
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/program.phtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/template/assemblies/program.phtml b/template/assemblies/program.phtml index 32fc4c8..496fa83 100644 --- a/template/assemblies/program.phtml +++ b/template/assemblies/program.phtml @@ -43,7 +43,7 @@ foreach(reset($program) as $event) title="Switch to <?=h($GLOBALS['CONFIG']['ROOMS'][$name])?>" ><?=h($event['title'])?></a> </h3> - + <h5>by <?=h($event['speaker'])?></h5> <? endif ?> </div> |