Merge branch 'master' into develop

This commit is contained in:
Timothy Warren 2017-10-18 20:00:00 -04:00
commit c76f23bffd

View File

@ -64,7 +64,7 @@
<div>
<dl>
<dt>About:</dt>
<dd><?= $escape->html($attributes['bio']) ?></dd>
<dd><?= $escape->html($attributes['about']) ?></dd>
</dl>
<?php if ( ! empty($favorites)): ?>
<?php if ( ! empty($favorites['characters'])): ?>