projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 999c09f 3d85504)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 31 May 2014 14:44:13 +0000 (16:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 31 May 2014 14:44:13 +0000 (16:44 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Location.min.js

1  2 
wcfsetup/install/files/style/layout.less patch | diff1 | diff2 | blob | history

WoltLab Suite Core (previously WoltLab Community Framework)