projects / oweals / finalsclub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40bc9a7 92d94c3)
Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub 16/head
authorSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
committerSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
Conflicts:
public/index.html

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

diff --cc public/index.html
index 0ea2819dd8a799240b45f5722088f08dd7c06dde,6a20a17a11d1aa363c2ef0dad0dc561f1ada0ab5..e9808ad9d9b00886f380bdc74a16e529731b7e9f
mode 100755,100644..100644
--- 1/public/index.html
--- 2/public/index.html
+++ b/public/index.html
@@@ -1,8 -1,6 +1,7 @@@
  <!DOCTYPE html>
  <html class="no-js">
- 
        <head>
 +              <title>FinalsClub.org: Online Social Note-Taking</title>
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="/assets/js/load.js"></script>
Unnamed repository; edit this file 'description' to name the repository.