projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b52f751 f9c3e81)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 8 Sep 2014 21:35:19 +0000 (23:35 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 8 Sep 2014 21:35:19 +0000 (23:35 +0200)
1  2 
com.woltlab.wcf/option.xml patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/option.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)