projects
/
WP-Themes
/
mountpleasantwow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c08e60
01d5380
)
Merge branch 'master' into release/1.2.39
author
laury
<laury@gaslightmedia.com>
Fri, 9 Nov 2018 18:35:08 +0000
(13:35 -0500)
committer
laury
<laury@gaslightmedia.com>
Fri, 9 Nov 2018 18:35:08 +0000
(13:35 -0500)
Conflicts:
header.php
style.css
1
2
header.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
header.php
Simple merge