projects / www.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 693b44d 70ec762)
Merge branch 'master' of git.freeside.biz:/home/git/www
authorIvan Kohler <ivan@freeside.biz>
Wed, 20 Jan 2016 16:54:18 +0000 (08:54 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 20 Jan 2016 16:54:18 +0000 (08:54 -0800)
1  2 
index.html patch | diff1 | diff2 | blob | history

diff --cc index.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.