projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 192d46b 2d84dcd)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 19 Aug 2014 18:33:49 +0000 (20:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 19 Aug 2014 18:33:49 +0000 (20:33 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Location.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)