diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 12:20:31 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 12:20:31 +0200 |
| commit | 05a2d7cfedce22fbf01499167dc7b5acf28d5462 (patch) | |
| tree | 8c0706328b6a33f715a6055e2861091970c574d5 | |
| parent | f832ce33462ebcb5cc31ac657f4e28192a02f305 (diff) | |
| parent | cfee2a1e2966a3d75e6079b899c29a8cca33d2df (diff) | |
Merge branch 'master' into master-da
Conflicts:
ikiwiki/openid/openid-jquery.js
| -rw-r--r-- | ikiwiki/openid/openid-jquery.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki/openid/openid-jquery.js b/ikiwiki/openid/openid-jquery.js index 8ba24f5..f5a28c5 100644 --- a/ikiwiki/openid/openid-jquery.js +++ b/ikiwiki/openid/openid-jquery.js @@ -38,7 +38,7 @@ var providers_small = { }, wordpress: { name: 'Wordpress', - icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico', + icon: 'https://s2.wp.com/i/favicon.ico', label: 'Angiv dit Wordpress.com brugernavn:', url: 'http://{username}.wordpress.com/' }, |