projects / GitHub / WoltLab / com.woltlab.wcf.conversation.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ca46a6 322dff1)
Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 26 Aug 2021 10:28:27 +0000 (12:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 26 Aug 2021 10:28:27 +0000 (12:28 +0200)
1  2 
language/de.xml patch | diff1 | diff2 | blob | history
language/en.xml patch | diff1 | diff2 | blob | history

diff --cc language/de.xml
Simple merge
diff --cc language/en.xml
Simple merge
User Conversation System