projects / enc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad76913 f2e49dc)
Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)
Conflicts:
static

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

diff --cc index.html
index 06b32675022823195d96db9b3d31722b228efb3d,fa3982ea0d2155a71fbce9d535f9b35c7222f419..1b6626f40603f4c92157cbf358b950e1a2cf5c44
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -9,8 -9,8 +9,12 @@@
                        private email through the use of GnuPG">
  
        <meta name="viewport" content="width=device-width, initial-scale=1">
 -      <link rel="stylesheet" href="http://static.fsf.org/nosvn/enc-dev0/css/main.css">
 -                      <link rel="shortcut icon" href="http://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 +                      <link rel="stylesheet" href="http://static.fsf.org/nosvn/enc-dev0/css/main.css">
 +              <link rel="shortcut icon" href="http://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
++
++<!--                  <link rel="stylesheet" href="http://static.fsf.org/nosvn/enc-dev0/css/main.css">
++-->
++
        </head>
        <body>
                <nav class="nav">
Unnamed repository; edit this file 'description' to name the repository.