disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ef61b4 1fed68c)
Merge branch 'mvc' into live
authorDylan Lloyd <dylan@dylansserver.com>
Wed, 13 Feb 2013 08:54:31 +0000 (03:54 -0500)
committerDylan Lloyd <dylan@dylansserver.com>
Wed, 13 Feb 2013 08:54:31 +0000 (03:54 -0500)
Conflicts:
includes/style.css

1  2 
includes/style.css patch | diff1 | diff2 | blob | history

diff --cc includes/style.css
Simple merge
my (old) website