projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb75fe8
5aa6f83
)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
author
Alexander Ebert
<ebert@woltlab.com>
Thu, 27 Jul 2017 13:54:08 +0000
(15:54 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Thu, 27 Jul 2017 13:54:08 +0000
(15:54 +0200)
# Conflicts:
# wcfsetup/install/files/acp/js/WCF.ACP.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
1
2
wcfsetup/install/files/acp/js/WCF.ACP.js
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/acp/templates/rescueMode.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Pagination.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/acp/js/WCF.ACP.js
Simple merge
diff --cc
wcfsetup/install/files/acp/templates/rescueMode.tpl
Simple merge
diff --cc
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Pagination.js
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff