projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4015c35 ecb54c3)
Merge branch 'refs/heads/pr/1984' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 Jan 2016 18:06:23 +0000 (19:06 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 Jan 2016 18:06:23 +0000 (19:06 +0100)
commit4f023450529b91380ceea4cbe17e51d9e864db35
treed0944017849d2c9c2a2f6a128a32a27db34b88ectree | snapshot (tar.gz zip)
parent4015c35d0fb56af69e7c4ef2c01e70117546cfeccommit | diff
parentecb54c30850a6ad01003e04324b9ea221f9c942ccommit | diff
Merge branch 'refs/heads/pr/1984' into next-lantia

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