projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6bfa74 ee490f0)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 4 May 2014 23:46:47 +0000 (01:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 4 May 2014 23:46:47 +0000 (01:46 +0200)
commit315390f71640d2d7a8de06505b00c762b66f1fa5
tree5225569ffc0268af936b78d7888f3cdc7ccc8db1tree | snapshot (tar.gz zip)
parentc6bfa74692e5a929c6e09ad6be0462cbaa80d91ccommit | diff
parentee490f0c3045b48a4b9114814b18842fad714c4ccommit | diff
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/js/WCF.js diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)