Merge branch 'master' into fixbug-107

2017-07-18 11:11:14 +01:00
parent 832ed0c1ff 2a332a2965
commit 073094f6dd
48 changed files with 898 additions and 287 deletions
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -36,7 +36,7 @@
 		</div>
 		{{/if}}
 	</div>
-	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
+	<div>{{#markdown}}{{evaluateSpellString charId parent.id description}}{{/markdown}}</div>
 	{{> attacksViewList charId=charId parentId=_id}}
 </template>