Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 17:27:08 +0000 (18:27 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 17:27:08 +0000 (18:27 +0100)
Conflicts:
static

1  2 
index.html

diff --cc index.html
index 20bb9b14201f939ad5155dc4bef1be90f0549bc6,fc20fb70b09f1c73e250ec5728b2a15aa73f6259..6d49b9b07e274fbc4e73f4c27ae1236751eba833
@@@ -11,8 -11,8 +11,8 @@@
                        <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" />
  
--<!-- our local static folder url -->                  <link rel="stylesheet" href="static/css/main.css">
--
++                      <!-- our local static folder url -->
++                      <link rel="stylesheet" href="static/css/main.css">
  
        </head>
        <body>
@@@ -24,7 -24,7 +24,7 @@@
                                        <li><a href="windows.html">Windows</a></li>
                                </ul>
                                <ul class="lang">
--                                      <li class="help"><a href="/">Translate this guide!</a></li>
++                                      <li class="help"><a href="http://libreplanet.org/wiki/GPG_guide">Translate this guide!</a></li>
                                </ul>
                        </div>
                </nav>