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 /images/icons/16 | |
| 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 'images/icons/16')
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/add.png | bin | 3068 -> 3068 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/delete.png | bin | 3142 -> 3142 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/edit.png | bin | 3129 -> 3129 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/feed.png | bin | 828 -> 828 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/gear.png | bin | 3199 -> 3199 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/group.png | bin | 852 -> 852 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/info.png | bin | 854 -> 854 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/link.png | bin | 579 -> 579 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/lock.png | bin | 593 -> 593 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/menu.png | bin | 3268 -> 3268 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/notice.png | bin | 591 -> 591 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/notify_off.png | bin | 835 -> 835 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/notify_on.png | bin | 542 -> 542 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/play.png | bin | 508 -> 508 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/plugin.png | bin | 649 -> 649 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/star.png | bin | 3498 -> 3498 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/unlock.png | bin | 547 -> 547 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/16/user.png | bin | 794 -> 794 bytes |
18 files changed, 0 insertions, 0 deletions
diff --git a/images/icons/16/add.png b/images/icons/16/add.png Binary files differindex 1ff064bb3..1ff064bb3 100755..100644 --- a/images/icons/16/add.png +++ b/images/icons/16/add.png diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png Binary files differindex 532346860..532346860 100755..100644 --- a/images/icons/16/delete.png +++ b/images/icons/16/delete.png diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png Binary files differindex bd845a767..bd845a767 100755..100644 --- a/images/icons/16/edit.png +++ b/images/icons/16/edit.png diff --git a/images/icons/16/feed.png b/images/icons/16/feed.png Binary files differindex 082e1bc73..082e1bc73 100755..100644 --- a/images/icons/16/feed.png +++ b/images/icons/16/feed.png diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png Binary files differindex 86cbe1eb8..86cbe1eb8 100755..100644 --- a/images/icons/16/gear.png +++ b/images/icons/16/gear.png diff --git a/images/icons/16/group.png b/images/icons/16/group.png Binary files differindex 29ef69672..29ef69672 100755..100644 --- a/images/icons/16/group.png +++ b/images/icons/16/group.png diff --git a/images/icons/16/info.png b/images/icons/16/info.png Binary files differindex e8e7b35ba..e8e7b35ba 100755..100644 --- a/images/icons/16/info.png +++ b/images/icons/16/info.png diff --git a/images/icons/16/link.png b/images/icons/16/link.png Binary files differindex afec9cc30..afec9cc30 100755..100644 --- a/images/icons/16/link.png +++ b/images/icons/16/link.png diff --git a/images/icons/16/lock.png b/images/icons/16/lock.png Binary files differindex 189bfd29e..189bfd29e 100755..100644 --- a/images/icons/16/lock.png +++ b/images/icons/16/lock.png diff --git a/images/icons/16/menu.png b/images/icons/16/menu.png Binary files differindex a6b1cac47..a6b1cac47 100755..100644 --- a/images/icons/16/menu.png +++ b/images/icons/16/menu.png diff --git a/images/icons/16/notice.png b/images/icons/16/notice.png Binary files differindex 13c5c6b79..13c5c6b79 100755..100644 --- a/images/icons/16/notice.png +++ b/images/icons/16/notice.png diff --git a/images/icons/16/notify_off.png b/images/icons/16/notify_off.png Binary files differindex 3031fc906..3031fc906 100755..100644 --- a/images/icons/16/notify_off.png +++ b/images/icons/16/notify_off.png diff --git a/images/icons/16/notify_on.png b/images/icons/16/notify_on.png Binary files differindex 1da6245a6..1da6245a6 100755..100644 --- a/images/icons/16/notify_on.png +++ b/images/icons/16/notify_on.png diff --git a/images/icons/16/play.png b/images/icons/16/play.png Binary files differindex 19ad05bf2..19ad05bf2 100755..100644 --- a/images/icons/16/play.png +++ b/images/icons/16/play.png diff --git a/images/icons/16/plugin.png b/images/icons/16/plugin.png Binary files differindex b11d92082..b11d92082 100755..100644 --- a/images/icons/16/plugin.png +++ b/images/icons/16/plugin.png diff --git a/images/icons/16/star.png b/images/icons/16/star.png Binary files differindex ac620c43c..ac620c43c 100755..100644 --- a/images/icons/16/star.png +++ b/images/icons/16/star.png diff --git a/images/icons/16/unlock.png b/images/icons/16/unlock.png Binary files differindex c56495d02..c56495d02 100755..100644 --- a/images/icons/16/unlock.png +++ b/images/icons/16/unlock.png diff --git a/images/icons/16/user.png b/images/icons/16/user.png Binary files differindex 95c42c572..95c42c572 100755..100644 --- a/images/icons/16/user.png +++ b/images/icons/16/user.png |
