projects / GitHub / WoltLab / com.woltlab.wcf.conversation.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 412f4a0 83e23d2)
Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Wed, 6 Mar 2013 20:21:20 +0000 (21:21 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 6 Mar 2013 20:21:20 +0000 (21:21 +0100)
1  2 
language/de.xml patch | diff1 | diff2 | blob | history

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