commit 859d527e2b0fbb55c5c4e7520bbd6cbd992fb392 parent e588392f5c9d23ecfcad45c736fee2e67bc3b43b Author: Christian Grothoff <christian@grothoff.org> Date: Mon, 7 Dec 2015 21:35:08 +0100 Merge branch 'master' of taler.net:/var/git/www Diffstat:
| M | about.html | | | 8 | ++++++++ |
| A | images/logo-2015-medium.png | | | 0 | |
| A | images/logo-2015.png | | | 0 | |
| M | index.html | | | 2 | +- |
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/about.html b/about.html @@ -115,6 +115,14 @@ <p lang="fr">Trop romantique pour devenir millionnaire</p> <p lang="es">Demasiado romántico para hacerse millonario</p> </div> + <div class="col-lg-4"> + <h2>Jeffrey Burdges</h2> + <p lang="en">Mathematician and developer. Intrested in privacy.</p> + <p lang="it">Matematico</p> <!- --> + <p lang="de">Mathematiker</p> <!- und Software Entwickler --> + <p lang="fr">mathématicien</p> <!- et développeur de logiciels --> + <p lang="es">Matemático</p> <!- y desarrollador de software --> + </div> </div> <!--# include file="common/footer.inc" --> diff --git a/images/logo-2015-medium.png b/images/logo-2015-medium.png Binary files differ. diff --git a/images/logo-2015.png b/images/logo-2015.png Binary files differ. diff --git a/index.html b/index.html @@ -15,7 +15,7 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img align="middle" width="33%" src="/images/logo-2014-medium.png" style="margin: 0px 0px -120px 0px;"></img> + <img align="middle" width="33%" src="/images/logo-2015-medium.png" style="margin: 0px 0px -120px 0px;"></img> </div> <div class="jumbotron"> <h1 lang="en">Electronic payments for a liberal society!</h1>
