projects / oweals / finalsclub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83a1fa1 9724b27)
Merge branch 'devel' of github.com:finalsclubdev/FinalsClub into devel
authorSeth Woodworth <seth@sethish.com>
Sun, 22 Jan 2012 21:51:18 +0000 (16:51 -0500)
committerSeth Woodworth <seth@sethish.com>
Sun, 22 Jan 2012 21:51:18 +0000 (16:51 -0500)
Conflicts:
public/index.html

1  2 
public/index.html patch | diff1 | diff2 | blob | history

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