git.stricted.de - GitHub/WoltLab/WCF.git/commit

projects / GitHub / WoltLab / WCF.git / commit

author	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 30 May 2016 16:50:54 +0000 (18:50 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 30 May 2016 16:50:54 +0000 (18:50 +0200)
commit	f2ef3a5572ea0fba462c17411084717e71d8d3a8
tree	73d38000cefa2159470a35aa77b0bf2fbb5dbea6	tree \| snapshot (tar.gz zip)
parent	cc486ed8116444b189d4ed1276049a572bf3417b	commit \| diff
parent	4e03f88ca323696efb2d960ad4741409af01db72	commit \| diff

Merge branch 'master' into next

Conflicts:
com.woltlab.wcf/bbcode.xml
com.woltlab.wcf/package.xml
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
wcfsetup/install/files/js/3rdParty/redactor/plugins/wutil.js
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCFSetup.class.php
wcfsetup/install/lang/en.xml
wcfsetup/setup/template/stepShowSystemRequirements.tpl
wcfsetup/test.php

WoltLab Suite Core (previously WoltLab Community Framework)

RSS Atom

wcfsetup/install/files/acp/templates/dataImport.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/WCFSetup.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/lang/setup_de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/lang/setup_en.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/template/stepShowSystemRequirements.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/test.php	diff1 \|	diff2 \|	blob \| history