projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7355151
5354107
)
Merge branch 'master' into next
author
Matthias Schmidt
<gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000
(06:45 +0100)
committer
Matthias Schmidt
<gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000
(06:45 +0100)
1
2
com.woltlab.wcf/templates/recaptcha.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/lang/en.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/templates/recaptcha.tpl
Simple merge
diff --cc
wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
Simple merge
diff --cc
wcfsetup/install/lang/en.xml
Simple merge