projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5a8fdd 5595e7c)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Wed, 12 Aug 2015 17:04:58 +0000 (19:04 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 12 Aug 2015 17:04:58 +0000 (19:04 +0200)
1  2 
wcfsetup/install/files/acp/templates/styleAdd.tpl patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

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