diff --git a/templates/topic.tpl b/templates/topic.tpl index 2b3d07b..12a5d64 100644 --- a/templates/topic.tpl +++ b/templates/topic.tpl @@ -17,6 +17,18 @@ {title} +
+ [[topic:merged_message, {mergeIntoTid}, {merger.mergedIntoTitle}]] + + + + {merger.username} + + + + +
+
[[topic:deleted_message]]