diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-12-07 21:35:08 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-12-07 21:35:08 +0100 |
commit | 859d527e2b0fbb55c5c4e7520bbd6cbd992fb392 (patch) | |
tree | e3253b714a122f3869b8ad6a600a3a2e6516b327 | |
parent | e588392f5c9d23ecfcad45c736fee2e67bc3b43b (diff) | |
parent | 2d1cd149a4c8873a69d6c106a21ed70526d1dcd9 (diff) | |
download | www-859d527e2b0fbb55c5c4e7520bbd6cbd992fb392.tar.gz www-859d527e2b0fbb55c5c4e7520bbd6cbd992fb392.zip |
Merge branch 'master' of taler.net:/var/git/www
-rw-r--r-- | about.html | 8 | ||||
-rw-r--r-- | images/logo-2015-medium.png | bin | 0 -> 75094 bytes | |||
-rw-r--r-- | images/logo-2015.png | bin | 0 -> 95429 bytes | |||
-rw-r--r-- | index.html | 2 |
4 files changed, 9 insertions, 1 deletions
@@ -115,6 +115,14 @@ | |||
115 | <p lang="fr">Trop romantique pour devenir millionnaire</p> | 115 | <p lang="fr">Trop romantique pour devenir millionnaire</p> |
116 | <p lang="es">Demasiado romántico para hacerse millonario</p> | 116 | <p lang="es">Demasiado romántico para hacerse millonario</p> |
117 | </div> | 117 | </div> |
118 | <div class="col-lg-4"> | ||
119 | <h2>Jeffrey Burdges</h2> | ||
120 | <p lang="en">Mathematician and developer. Intrested in privacy.</p> | ||
121 | <p lang="it">Matematico</p> <!- --> | ||
122 | <p lang="de">Mathematiker</p> <!- und Software Entwickler --> | ||
123 | <p lang="fr">mathématicien</p> <!- et développeur de logiciels --> | ||
124 | <p lang="es">Matemático</p> <!- y desarrollador de software --> | ||
125 | </div> | ||
118 | </div> | 126 | </div> |
119 | 127 | ||
120 | <!--# include file="common/footer.inc" --> | 128 | <!--# include file="common/footer.inc" --> |
diff --git a/images/logo-2015-medium.png b/images/logo-2015-medium.png new file mode 100644 index 00000000..78159bb2 --- /dev/null +++ b/images/logo-2015-medium.png | |||
Binary files differ | |||
diff --git a/images/logo-2015.png b/images/logo-2015.png new file mode 100644 index 00000000..7c988c94 --- /dev/null +++ b/images/logo-2015.png | |||
Binary files differ | |||
@@ -15,7 +15,7 @@ | |||
15 | <!--# include file="common/navigation.inc" --> | 15 | <!--# include file="common/navigation.inc" --> |
16 | <!-- Jumbotron --> | 16 | <!-- Jumbotron --> |
17 | <div class="jumbotron"> | 17 | <div class="jumbotron"> |
18 | <img align="middle" width="33%" src="/images/logo-2014-medium.png" style="margin: 0px 0px -120px 0px;"></img> | 18 | <img align="middle" width="33%" src="/images/logo-2015-medium.png" style="margin: 0px 0px -120px 0px;"></img> |
19 | </div> | 19 | </div> |
20 | <div class="jumbotron"> | 20 | <div class="jumbotron"> |
21 | <h1 lang="en">Electronic payments for a liberal society!</h1> | 21 | <h1 lang="en">Electronic payments for a liberal society!</h1> |