projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1fffd8d
f711cb1
)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
author
Alexander Ebert
<ebert@woltlab.com>
Sat, 6 May 2017 11:18:27 +0000
(13:18 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Sat, 6 May 2017 11:18:27 +0000
(13:18 +0200)
# Conflicts:
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
1
2
wcfsetup/install/files/style/ui/message.scss
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/style/ui/message.scss
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff