projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b7266c 6ac55a0)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 15:05:56 +0000 (17:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 15:05:56 +0000 (17:05 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Combined.min.js
wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
wcfsetup/install/files/lib/system/WCF.class.php

1  2 
com.woltlab.wcf/objectTypeDefinition.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/files/js/WCF.User.js patch | diff1 | diff2 | blob | history
wcfsetup/install/files/style/layout.less patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/files/js/WCF.User.js
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)