Merge branch 'master' into feature-custom-buffs

This commit is contained in:
Stefan Zermatten
2017-09-07 14:41:33 +02:00
committed by GitHub
15 changed files with 333 additions and 17 deletions

View File

@@ -78,7 +78,7 @@
</div>
{{/if}}
</div>
{{#if description}}
{{#if hasCharacters (evaluateShortString charId description)}}
<div class="bottom flex">
{{#markdown}}{{evaluateShortString charId description}}{{/markdown}}
{{> customBuffViewList charId=charId parentId=_id}}