From: Ana Isabel Carvalho Date: Wed, 4 Jun 2014 10:32:53 +0000 (+0100) Subject: Merge branch 'master' of vcs.fsf.org:enc X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=05bfcb9e80da6b2688a36e92429957b27bdd636b;hp=ad76913cf028276f2e5f386a0ad089c8f4050bc7;p=enc-live.git Merge branch 'master' of vcs.fsf.org:enc Conflicts: static --- diff --git a/index.html b/index.html index 06b3267..1b6626f 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,10 @@ + + +