diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 15:48:24 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 15:48:24 +0100 |
| commit | fbffc8a34362d9beff504923560871e70ce0f817 (patch) | |
| tree | 99c1627791e1ebe65f1218be10d368b6c9457459 /ikiwiki/openid/goa-account-flickr.png | |
| parent | 05a2d7cfedce22fbf01499167dc7b5acf28d5462 (diff) | |
| parent | 54060dcc2470ac536e986f6f24d2d6c564f3bb9e (diff) | |
Merge branch 'master' into master-damaster-da
Conflicts (resolved manually):
ikiwiki/openid/openid-jquery.js
Diffstat (limited to 'ikiwiki/openid/goa-account-flickr.png')
| -rw-r--r-- | ikiwiki/openid/goa-account-flickr.png | bin | 0 -> 592 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/ikiwiki/openid/goa-account-flickr.png b/ikiwiki/openid/goa-account-flickr.png Binary files differnew file mode 100644 index 0000000..5321642 --- /dev/null +++ b/ikiwiki/openid/goa-account-flickr.png |
