projects / GitHub / WoltLab / com.woltlab.wcf.conversation.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a0e71e e27c551)
Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:58 +0000 (17:27 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 16:27:58 +0000 (17:27 +0100)
1  2 
language/de.xml patch | diff1 | diff2 | blob | history

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