projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 827a69f 39db335)
Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 19 May 2015 13:42:06 +0000 (15:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 19 May 2015 13:42:06 +0000 (15:42 +0200)
commit8c2bb4f9e91db604a900bfe926c1492c6ce35c4a
treeaffb765316321861191392bb5f7077a0c81566fctree | snapshot (tar.gz zip)
parent827a69f3bc825a36ab44eed80cb5ed204ae2c733commit | diff
parent39db3357c3c9de9385c1f326b8bacae72074ace1commit | diff
Merge branch 'next' of github.com:WoltLab/WCF into next

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