diff options
author | friendica <info@friendica.com> | 2014-10-06 15:02:48 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-10-06 15:02:48 -0700 |
commit | dc6b789871eeae893ff406c02606cd1de4ecd1e8 (patch) | |
tree | 35437b034abc2ffae7b7e132ae8c7bd99e1dbf1c | |
parent | 5236516145180dbef9cc10e49c341b85e43e8c48 (diff) | |
parent | 5be36112edf623c7ad266dce444913162486a6ba (diff) | |
download | volse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.tar.gz volse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.tar.bz2 volse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.zip |
Merge https://github.com/friendica/red into pending_merge
12 files changed, 0 insertions, 0 deletions
diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/175.png Binary files differindex d8e49d43c..bc5b19793 100644 --- a/images/default_profile_photos/black_avatar_1/175.png +++ b/images/default_profile_photos/black_avatar_1/175.png diff --git a/images/default_profile_photos/black_avatar_1/48.png b/images/default_profile_photos/black_avatar_1/48.png Binary files differindex c616776b6..7c7ed4504 100644 --- a/images/default_profile_photos/black_avatar_1/48.png +++ b/images/default_profile_photos/black_avatar_1/48.png diff --git a/images/default_profile_photos/black_avatar_1/80.png b/images/default_profile_photos/black_avatar_1/80.png Binary files differindex 29eb8fb5d..21108b008 100644 --- a/images/default_profile_photos/black_avatar_1/80.png +++ b/images/default_profile_photos/black_avatar_1/80.png diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/175.png Binary files differindex 1a9473300..8ff3cbd4c 100644 --- a/images/default_profile_photos/black_avatar_2/175.png +++ b/images/default_profile_photos/black_avatar_2/175.png diff --git a/images/default_profile_photos/black_avatar_2/48.png b/images/default_profile_photos/black_avatar_2/48.png Binary files differindex 073e0323a..e7c37b741 100644 --- a/images/default_profile_photos/black_avatar_2/48.png +++ b/images/default_profile_photos/black_avatar_2/48.png diff --git a/images/default_profile_photos/black_avatar_2/80.png b/images/default_profile_photos/black_avatar_2/80.png Binary files differindex fa7d92a91..9a4843562 100644 --- a/images/default_profile_photos/black_avatar_2/80.png +++ b/images/default_profile_photos/black_avatar_2/80.png diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/175.png Binary files differindex 8251149a0..31d39a41a 100644 --- a/images/default_profile_photos/red_avatar/175.png +++ b/images/default_profile_photos/red_avatar/175.png diff --git a/images/default_profile_photos/red_avatar/48.png b/images/default_profile_photos/red_avatar/48.png Binary files differindex a889651ec..cf42b51fa 100644 --- a/images/default_profile_photos/red_avatar/48.png +++ b/images/default_profile_photos/red_avatar/48.png diff --git a/images/default_profile_photos/red_avatar/80.png b/images/default_profile_photos/red_avatar/80.png Binary files differindex 7ddea61c2..850c59938 100644 --- a/images/default_profile_photos/red_avatar/80.png +++ b/images/default_profile_photos/red_avatar/80.png diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/175.png Binary files differindex daa15d8f8..7299c4494 100644 --- a/images/default_profile_photos/redmatrix_logo_smiley/175.png +++ b/images/default_profile_photos/redmatrix_logo_smiley/175.png diff --git a/images/default_profile_photos/redmatrix_logo_smiley/48.png b/images/default_profile_photos/redmatrix_logo_smiley/48.png Binary files differindex 20704bc98..0b0ebad12 100644 --- a/images/default_profile_photos/redmatrix_logo_smiley/48.png +++ b/images/default_profile_photos/redmatrix_logo_smiley/48.png diff --git a/images/default_profile_photos/redmatrix_logo_smiley/80.png b/images/default_profile_photos/redmatrix_logo_smiley/80.png Binary files differindex 30e0abbbd..4d8b18a13 100644 --- a/images/default_profile_photos/redmatrix_logo_smiley/80.png +++ b/images/default_profile_photos/redmatrix_logo_smiley/80.png |