diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /library/simplepie/demo/for_the_demo/favicons | |
parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'library/simplepie/demo/for_the_demo/favicons')
14 files changed, 0 insertions, 0 deletions
diff --git a/library/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png Binary files differindex 063fb2805..063fb2805 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/alternate.png +++ b/library/simplepie/demo/for_the_demo/favicons/alternate.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png Binary files differindex 53200b3c6..53200b3c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blinklist.png +++ b/library/simplepie/demo/for_the_demo/favicons/blinklist.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png Binary files differindex c5372614a..c5372614a 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png +++ b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png diff --git a/library/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png Binary files differindex 2e6021d26..2e6021d26 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/delicious.png +++ b/library/simplepie/demo/for_the_demo/favicons/delicious.png diff --git a/library/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png Binary files differindex 3aa96770e..3aa96770e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/digg.png +++ b/library/simplepie/demo/for_the_demo/favicons/digg.png diff --git a/library/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png Binary files differindex da519f5ab..da519f5ab 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/magnolia.png +++ b/library/simplepie/demo/for_the_demo/favicons/magnolia.png diff --git a/library/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png Binary files differindex 2a12968d5..2a12968d5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/myweb2.png +++ b/library/simplepie/demo/for_the_demo/favicons/myweb2.png diff --git a/library/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png Binary files differindex 5cdbb31c6..5cdbb31c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/newsvine.png +++ b/library/simplepie/demo/for_the_demo/favicons/newsvine.png diff --git a/library/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png Binary files differindex 65c38867c..65c38867c 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/reddit.png +++ b/library/simplepie/demo/for_the_demo/favicons/reddit.png diff --git a/library/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png Binary files differindex 748149b37..748149b37 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/segnalo.png +++ b/library/simplepie/demo/for_the_demo/favicons/segnalo.png diff --git a/library/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png Binary files differindex 30b23c1a5..30b23c1a5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/simpy.png +++ b/library/simplepie/demo/for_the_demo/favicons/simpy.png diff --git a/library/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png Binary files differindex f5be3963d..f5be3963d 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/spurl.png +++ b/library/simplepie/demo/for_the_demo/favicons/spurl.png diff --git a/library/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png Binary files differindex 0f19e824e..0f19e824e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/technorati.png +++ b/library/simplepie/demo/for_the_demo/favicons/technorati.png diff --git a/library/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png Binary files differindex 2e2d294d1..2e2d294d1 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/wists.png +++ b/library/simplepie/demo/for_the_demo/favicons/wists.png |