projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27db335 d2fbf9b)
Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Wed, 16 Mar 2016 12:03:57 +0000 (13:03 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 16 Mar 2016 12:03:57 +0000 (13:03 +0100)
# Conflicts:
# wcfsetup/install/files/acp/templates/noticeAdd.tpl

1  2 
com.woltlab.wcf/templates/userNotice.tpl patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history
wcfsetup/setup/db/install.sql patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)