diff options
| author | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-10-23 20:09:50 +0200 |
|---|---|---|
| committer | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-10-23 20:09:50 +0200 |
| commit | adb68dcdf84449101a519b70ff8a5a4117087068 (patch) | |
| tree | 2f3b4ebd605f5177760c4dc6cb6cca5289774948 /services | |
| parent | 7e254d425fb8d3179f50df5bf56e019306043455 (diff) | |
| parent | a0373ecc8a576a528985653933b5a95b4114ca72 (diff) | |
| download | www-adb68dcdf84449101a519b70ff8a5a4117087068.tar.gz www-adb68dcdf84449101a519b70ff8a5a4117087068.tar.bz2 www-adb68dcdf84449101a519b70ff8a5a4117087068.zip | |
Merge branch 'master' of ssh://git.spline.de/www
Diffstat (limited to 'services')
| -rw-r--r-- | services/accounts.html (renamed from services/account.html) | 6 | ||||
| -rw-r--r-- | services/jabber.html | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/account.html b/services/accounts.html index 5d31d2e..0de331b 100644 --- a/services/account.html +++ b/services/accounts.html @@ -1,8 +1,8 @@ {% meta %} - title: Account - logo_url: static/images/services/account.png + title: Accounts + logo_url: static/images/services/accounts.png description: zentrale Accountverwaltung für die Spline-Dienste - link: http://account.spline.de + link: https://accounts.spline.de {% endmeta %} {% block content %} diff --git a/services/jabber.html b/services/jabber.html index 1fc3bb9..571d1a6 100644 --- a/services/jabber.html +++ b/services/jabber.html @@ -1,7 +1,7 @@ {% meta %} title: Jabber logo_url: static/images/services/jabber.png - description: für ein dezentrales Netz der Spline Jabber Server + description: für ein dezentrales Netz: der Spline-Jabber-Server link: http://jabber.spline.de {% endmeta %} |