projects / WP-Themes / mountpleasantwow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b3ffe2 55e3574)
fix conflict
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Jan 2016 18:40:52 +0000 (13:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Jan 2016 18:40:52 +0000 (13:40 -0500)
1  2 
functions.php patch | diff1 | diff2 | blob | history

diff --cc functions.php
Simple merge