projects / GitHub / WoltLab / com.woltlab.wcf.legalNotice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ece22a4 17f1dca)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 09:56:04 +0000 (11:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 09:56:04 +0000 (11:56 +0200)
1  2 
language/en.xml patch | diff1 | diff2 | blob | history

diff --cc language/en.xml
Simple merge
Legal Notice System