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 /view/theme/dispy/icons | |
| 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 'view/theme/dispy/icons')
| -rw-r--r-- | view/theme/dispy/icons/StatusNet.png | bin | 0 -> 1048 bytes |
| -rw-r--r-- | view/theme/dispy/icons/email.png | bin | 0 -> 853 bytes |
| -rw-r--r-- | view/theme/dispy/icons/facebook.png | bin | 0 -> 1097 bytes |
| -rw-r--r-- | view/theme/dispy/icons/livejournal.png | bin | 0 -> 1571 bytes |
| -rw-r--r-- | view/theme/dispy/icons/posterous.png | bin | 0 -> 1223 bytes |
| -rw-r--r-- | view/theme/dispy/icons/tumblr.png | bin | 0 -> 843 bytes |
| -rw-r--r-- | view/theme/dispy/icons/twitter.png | bin | 0 -> 967 bytes |
| -rw-r--r-- | view/theme/dispy/icons/wordpress.png | bin | 0 -> 1346 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/dispy/icons/StatusNet.png b/view/theme/dispy/icons/StatusNet.png Binary files differnew file mode 100644 index 000000000..1b5f9a677 --- /dev/null +++ b/view/theme/dispy/icons/StatusNet.png diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png Binary files differnew file mode 100644 index 000000000..b9d64cb93 --- /dev/null +++ b/view/theme/dispy/icons/email.png diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png Binary files differnew file mode 100644 index 000000000..ff5129f94 --- /dev/null +++ b/view/theme/dispy/icons/facebook.png diff --git a/view/theme/dispy/icons/livejournal.png b/view/theme/dispy/icons/livejournal.png Binary files differnew file mode 100644 index 000000000..5ba5f7f7d --- /dev/null +++ b/view/theme/dispy/icons/livejournal.png diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png Binary files differnew file mode 100644 index 000000000..d0ae6face --- /dev/null +++ b/view/theme/dispy/icons/posterous.png diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png Binary files differnew file mode 100644 index 000000000..9d5fcd045 --- /dev/null +++ b/view/theme/dispy/icons/tumblr.png diff --git a/view/theme/dispy/icons/twitter.png b/view/theme/dispy/icons/twitter.png Binary files differnew file mode 100644 index 000000000..4a068451e --- /dev/null +++ b/view/theme/dispy/icons/twitter.png diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png Binary files differnew file mode 100644 index 000000000..6a4e36d45 --- /dev/null +++ b/view/theme/dispy/icons/wordpress.png |
