diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
commit | ff87732053bae38879988ba7d002a294998ccb4e (patch) | |
tree | ccccfe7fc8976baf1f0cd4438a57bf817dc4052c /theme/identica/default-avatar-mini.png | |
parent | 27aeba01dd366f15f7847267b7518fb873987ddb (diff) | |
parent | f3cdc7f272e409d391979d3e6c58dd63573530c0 (diff) |
Merge branch '0.8.x' into testing
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
Diffstat (limited to 'theme/identica/default-avatar-mini.png')
-rw-r--r-- | theme/identica/default-avatar-mini.png | bin | 646 -> 512 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/theme/identica/default-avatar-mini.png b/theme/identica/default-avatar-mini.png Binary files differindex 38b8692b4..6c7808616 100644 --- a/theme/identica/default-avatar-mini.png +++ b/theme/identica/default-avatar-mini.png |