projects / GitHub / WoltLab / com.woltlab.wcf.conversation.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a11305 249ebcd)
Merge branch '3.1' into 5.2
authorMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:49:52 +0000 (10:49 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:49:52 +0000 (10:49 +0200)
1  2 
templates/conversationList.tpl patch | diff1 | diff2 | blob | history

diff --cc templates/conversationList.tpl
Simple merge
User Conversation System