From: Seth Woodworth Date: Wed, 7 Dec 2011 04:20:13 +0000 (+0000) Subject: Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub X-Git-Url: https://git.librecmc.org/?p=oweals%2Ffinalsclub.git;a=commitdiff_plain;h=b96ea8865f681f85180e623863592814918ba49a Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub Conflicts: public/index.html --- b96ea8865f681f85180e623863592814918ba49a diff --cc public/index.html index 0ea2819,6a20a17..e9808ad mode 100755,100644..100644 --- a/public/index.html +++ b/public/index.html @@@ -1,8 -1,6 +1,7 @@@ - + FinalsClub.org: Online Social Note-Taking