projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b72baa 19413de)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 26 Sep 2014 16:38:12 +0000 (18:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 26 Sep 2014 16:38:12 +0000 (18:38 +0200)
commit5636a4897d459c092715e13d571b176aef904734
tree5015281b9519d63252f80c36dfa2f68b68f1c8a6tree | snapshot (tar.gz zip)
parent4b72baa34fa9c83498a1dfb2d265bf4b41d0c131commit | diff
parent19413de60c9b45b40d5932a7a76a7aa109e1347acommit | diff
Merge branch '2.0'

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