Merge remote-tracking branch 'upstream/master'

2015-09-25 22:25:35 +02:00 · 2015-09-25 22:25:35 +02:00 · 8e410f14b1
commit 8e410f14b1
parent a7b2d23e9b 9bde18492a
15 changed files with 0 additions and 0 deletions
--- a/images/default_profile_photos/arrow_avatar/300.png
+++ b/images/default_profile_photos/arrow_avatar/300.png
--- a/images/default_profile_photos/arrow_avatar/48.png
+++ b/images/default_profile_photos/arrow_avatar/48.png
--- a/images/default_profile_photos/arrow_avatar/80.png
+++ b/images/default_profile_photos/arrow_avatar/80.png
--- a/images/default_profile_photos/hubzilla_avatar/300.png
+++ b/images/default_profile_photos/hubzilla_avatar/300.png
--- a/images/default_profile_photos/hubzilla_avatar/48.png
+++ b/images/default_profile_photos/hubzilla_avatar/48.png
--- a/images/default_profile_photos/hubzilla_avatar/80.png
+++ b/images/default_profile_photos/hubzilla_avatar/80.png
--- a/images/hubzilla_logo_1.png
+++ b/images/hubzilla_logo_1.png
--- a/images/hubzilla_logo_2.png
+++ b/images/hubzilla_logo_2.png
--- a/images/hubzilla_logo_3.png
+++ b/images/hubzilla_logo_3.png
--- a/images/hubzilla_logo_4.png
+++ b/images/hubzilla_logo_4.png
--- a/images/hubzilla_logo_5.png
+++ b/images/hubzilla_logo_5.png
--- a/images/hubzilla_logo_6.png
+++ b/images/hubzilla_logo_6.png
--- a/images/hz-16.png
+++ b/images/hz-16.png
--- a/images/hz-32.png
+++ b/images/hz-32.png
--- a/images/hz-64.png
+++ b/images/hz-64.png