diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
| commit | c90f14c066d0f289bd2220bb66325db12700aa57 (patch) | |
| tree | 6c915ad03936d479d1d807540bbc0e7ae0f854ad /images | |
| parent | 24ec104819bbc3778a159ea4790398988a6e2fd7 (diff) | |
| parent | 3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff) | |
| download | volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2 volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
Diffstat (limited to 'images')
| -rw-r--r-- | images/default_profile_photos/alpha/300.png (renamed from images/default_profile_photos/alpha/175.png) | bin | 3817 -> 3817 bytes |
| -rw-r--r-- | images/default_profile_photos/black_avatar_1/300.png (renamed from images/default_profile_photos/black_avatar_1/175.png) | bin | 6420 -> 6420 bytes |
| -rw-r--r-- | images/default_profile_photos/black_avatar_2/300.png (renamed from images/default_profile_photos/black_avatar_2/175.png) | bin | 5802 -> 5802 bytes |
| -rw-r--r-- | images/default_profile_photos/blank/300.jpg (renamed from images/default_profile_photos/blank/175.jpg) | bin | 910 -> 910 bytes |
| -rw-r--r-- | images/default_profile_photos/blank/300.png (renamed from images/default_profile_photos/blank/175.png) | bin | 3817 -> 3817 bytes |
| -rw-r--r-- | images/default_profile_photos/rainbow_man/300.jpg (renamed from images/default_profile_photos/rainbow_man/175.jpg) | bin | 8510 -> 8510 bytes |
| -rw-r--r-- | images/default_profile_photos/rainbow_man/300.png (renamed from images/default_profile_photos/rainbow_man/175.png) | bin | 57998 -> 57998 bytes |
| -rw-r--r-- | images/default_profile_photos/rainbow_man_trans/300.png (renamed from images/default_profile_photos/rainbow_man_trans/175.png) | bin | 71198 -> 71198 bytes |
| -rw-r--r-- | images/default_profile_photos/red_avatar/300.png (renamed from images/default_profile_photos/red_avatar/175.png) | bin | 4621 -> 4621 bytes |
| -rw-r--r-- | images/default_profile_photos/red_koala/300.jpg (renamed from images/default_profile_photos/red_koala/175.jpg) | bin | 22969 -> 22969 bytes |
| -rw-r--r-- | images/default_profile_photos/red_koala/300.png (renamed from images/default_profile_photos/red_koala/175.png) | bin | 20722 -> 20722 bytes |
| -rw-r--r-- | images/default_profile_photos/red_koala_trans/300.png (renamed from images/default_profile_photos/red_koala_trans/175.png) | bin | 25546 -> 25546 bytes |
| -rw-r--r-- | images/default_profile_photos/redmatrix_logo_smiley/300.png (renamed from images/default_profile_photos/redmatrix_logo_smiley/175.png) | bin | 3834 -> 3834 bytes |
13 files changed, 0 insertions, 0 deletions
diff --git a/images/default_profile_photos/alpha/175.png b/images/default_profile_photos/alpha/300.png Binary files differindex 17211ee27..17211ee27 100644 --- a/images/default_profile_photos/alpha/175.png +++ b/images/default_profile_photos/alpha/300.png diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/300.png Binary files differindex bc5b19793..bc5b19793 100644 --- a/images/default_profile_photos/black_avatar_1/175.png +++ b/images/default_profile_photos/black_avatar_1/300.png diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/300.png Binary files differindex 8ff3cbd4c..8ff3cbd4c 100644 --- a/images/default_profile_photos/black_avatar_2/175.png +++ b/images/default_profile_photos/black_avatar_2/300.png diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/300.jpg Binary files differindex 4024d6e88..4024d6e88 100644 --- a/images/default_profile_photos/blank/175.jpg +++ b/images/default_profile_photos/blank/300.jpg diff --git a/images/default_profile_photos/blank/175.png b/images/default_profile_photos/blank/300.png Binary files differindex 1edb25b76..1edb25b76 100644 --- a/images/default_profile_photos/blank/175.png +++ b/images/default_profile_photos/blank/300.png diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/300.jpg Binary files differindex fc0ec3d77..fc0ec3d77 100644 --- a/images/default_profile_photos/rainbow_man/175.jpg +++ b/images/default_profile_photos/rainbow_man/300.jpg diff --git a/images/default_profile_photos/rainbow_man/175.png b/images/default_profile_photos/rainbow_man/300.png Binary files differindex 30a7e0ffb..30a7e0ffb 100644 --- a/images/default_profile_photos/rainbow_man/175.png +++ b/images/default_profile_photos/rainbow_man/300.png diff --git a/images/default_profile_photos/rainbow_man_trans/175.png b/images/default_profile_photos/rainbow_man_trans/300.png Binary files differindex a0a236841..a0a236841 100644 --- a/images/default_profile_photos/rainbow_man_trans/175.png +++ b/images/default_profile_photos/rainbow_man_trans/300.png diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/300.png Binary files differindex 31d39a41a..31d39a41a 100644 --- a/images/default_profile_photos/red_avatar/175.png +++ b/images/default_profile_photos/red_avatar/300.png diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/300.jpg Binary files differindex e49343b1d..e49343b1d 100644 --- a/images/default_profile_photos/red_koala/175.jpg +++ b/images/default_profile_photos/red_koala/300.jpg diff --git a/images/default_profile_photos/red_koala/175.png b/images/default_profile_photos/red_koala/300.png Binary files differindex ee4a701d9..ee4a701d9 100644 --- a/images/default_profile_photos/red_koala/175.png +++ b/images/default_profile_photos/red_koala/300.png diff --git a/images/default_profile_photos/red_koala_trans/175.png b/images/default_profile_photos/red_koala_trans/300.png Binary files differindex 4e51c80e2..4e51c80e2 100644 --- a/images/default_profile_photos/red_koala_trans/175.png +++ b/images/default_profile_photos/red_koala_trans/300.png diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png Binary files differindex 7299c4494..7299c4494 100644 --- a/images/default_profile_photos/redmatrix_logo_smiley/175.png +++ b/images/default_profile_photos/redmatrix_logo_smiley/300.png |
