aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-06 15:02:48 -0700
committerfriendica <info@friendica.com>2014-10-06 15:02:48 -0700
commitdc6b789871eeae893ff406c02606cd1de4ecd1e8 (patch)
tree35437b034abc2ffae7b7e132ae8c7bd99e1dbf1c
parent5236516145180dbef9cc10e49c341b85e43e8c48 (diff)
parent5be36112edf623c7ad266dce444913162486a6ba (diff)
downloadvolse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.tar.gz
volse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.tar.bz2
volse-hubzilla-dc6b789871eeae893ff406c02606cd1de4ecd1e8.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--images/default_profile_photos/black_avatar_1/175.pngbin22487 -> 6420 bytes
-rw-r--r--images/default_profile_photos/black_avatar_1/48.pngbin10714 -> 1763 bytes
-rw-r--r--images/default_profile_photos/black_avatar_1/80.pngbin14015 -> 2986 bytes
-rw-r--r--images/default_profile_photos/black_avatar_2/175.pngbin20336 -> 5802 bytes
-rw-r--r--images/default_profile_photos/black_avatar_2/48.pngbin9714 -> 1516 bytes
-rw-r--r--images/default_profile_photos/black_avatar_2/80.pngbin12770 -> 2598 bytes
-rw-r--r--images/default_profile_photos/red_avatar/175.pngbin24460 -> 4621 bytes
-rw-r--r--images/default_profile_photos/red_avatar/48.pngbin11194 -> 1724 bytes
-rw-r--r--images/default_profile_photos/red_avatar/80.pngbin14481 -> 2660 bytes
-rw-r--r--images/default_profile_photos/redmatrix_logo_smiley/175.pngbin16256 -> 3834 bytes
-rw-r--r--images/default_profile_photos/redmatrix_logo_smiley/48.pngbin8006 -> 1205 bytes
-rw-r--r--images/default_profile_photos/redmatrix_logo_smiley/80.pngbin10184 -> 1631 bytes
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
index d8e49d43c..bc5b19793 100644
--- a/images/default_profile_photos/black_avatar_1/175.png
+++ b/images/default_profile_photos/black_avatar_1/175.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_1/48.png b/images/default_profile_photos/black_avatar_1/48.png
index c616776b6..7c7ed4504 100644
--- a/images/default_profile_photos/black_avatar_1/48.png
+++ b/images/default_profile_photos/black_avatar_1/48.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_1/80.png b/images/default_profile_photos/black_avatar_1/80.png
index 29eb8fb5d..21108b008 100644
--- a/images/default_profile_photos/black_avatar_1/80.png
+++ b/images/default_profile_photos/black_avatar_1/80.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/175.png
index 1a9473300..8ff3cbd4c 100644
--- a/images/default_profile_photos/black_avatar_2/175.png
+++ b/images/default_profile_photos/black_avatar_2/175.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_2/48.png b/images/default_profile_photos/black_avatar_2/48.png
index 073e0323a..e7c37b741 100644
--- a/images/default_profile_photos/black_avatar_2/48.png
+++ b/images/default_profile_photos/black_avatar_2/48.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_2/80.png b/images/default_profile_photos/black_avatar_2/80.png
index fa7d92a91..9a4843562 100644
--- a/images/default_profile_photos/black_avatar_2/80.png
+++ b/images/default_profile_photos/black_avatar_2/80.png
Binary files differ
diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/175.png
index 8251149a0..31d39a41a 100644
--- a/images/default_profile_photos/red_avatar/175.png
+++ b/images/default_profile_photos/red_avatar/175.png
Binary files differ
diff --git a/images/default_profile_photos/red_avatar/48.png b/images/default_profile_photos/red_avatar/48.png
index a889651ec..cf42b51fa 100644
--- a/images/default_profile_photos/red_avatar/48.png
+++ b/images/default_profile_photos/red_avatar/48.png
Binary files differ
diff --git a/images/default_profile_photos/red_avatar/80.png b/images/default_profile_photos/red_avatar/80.png
index 7ddea61c2..850c59938 100644
--- a/images/default_profile_photos/red_avatar/80.png
+++ b/images/default_profile_photos/red_avatar/80.png
Binary files differ
diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/175.png
index daa15d8f8..7299c4494 100644
--- a/images/default_profile_photos/redmatrix_logo_smiley/175.png
+++ b/images/default_profile_photos/redmatrix_logo_smiley/175.png
Binary files differ
diff --git a/images/default_profile_photos/redmatrix_logo_smiley/48.png b/images/default_profile_photos/redmatrix_logo_smiley/48.png
index 20704bc98..0b0ebad12 100644
--- a/images/default_profile_photos/redmatrix_logo_smiley/48.png
+++ b/images/default_profile_photos/redmatrix_logo_smiley/48.png
Binary files differ
diff --git a/images/default_profile_photos/redmatrix_logo_smiley/80.png b/images/default_profile_photos/redmatrix_logo_smiley/80.png
index 30e0abbbd..4d8b18a13 100644
--- a/images/default_profile_photos/redmatrix_logo_smiley/80.png
+++ b/images/default_profile_photos/redmatrix_logo_smiley/80.png
Binary files differ