projects / GitHub / WoltLab / com.woltlab.wcf.legalNotice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e633db1 42ddd84)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 14:22:41 +0000 (16:22 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 14:22:41 +0000 (16:22 +0200)
# Conflicts:
# package.xml

1  2 
language/en.xml patch | diff1 | diff2 | blob | history

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