projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit938f5218a1037c1650f15f97e2894170cf6810d3
tree9905a8d8117c136f6b093476cc97f1358bc2e123tree | snapshot (tar.gz zip)
parent999c09ffe5f9e71ab75f17aee5b05141e4013419commit | diff
parent3d8550419a835f445479dcc4fbb12ce09b18528dcommit | diff
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Location.min.js
wcfsetup/install/files/style/layout.less diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)