projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1ee472
c91fd2e
)
Merge branch 'next' into next-lantia
author
Alexander Ebert
<ebert@woltlab.com>
Mon, 28 Sep 2015 11:49:11 +0000
(13:49 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Mon, 28 Sep 2015 11:49:11 +0000
(13:49 +0200)
Conflicts:
com.woltlab.wcf/templates/messageSidebar.tpl
1
2
com.woltlab.wcf/templates/userSidebar.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/acp/templates/styleAdd.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/js/WCF.Message.js
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/js/WCF.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/templates/userSidebar.tpl
Simple merge
diff --cc
wcfsetup/install/files/acp/templates/styleAdd.tpl
Simple merge
diff --cc
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
Simple merge
diff --cc
wcfsetup/install/files/js/WCF.Message.js
Simple merge
diff --cc
wcfsetup/install/files/js/WCF.js
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff