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/48 | |
| 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/48')
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/add.png | bin | 3944 -> 3944 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/delete.png | bin | 3997 -> 3997 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/edit.png | bin | 3948 -> 3948 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/feed.png | bin | 2692 -> 2692 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/gear.png | bin | 4225 -> 4225 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/group.png | bin | 2392 -> 2392 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/info.png | bin | 2152 -> 2152 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/link.png | bin | 1685 -> 1685 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/lock.png | bin | 1340 -> 1340 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/menu.png | bin | 4607 -> 4607 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/notice.png | bin | 1730 -> 1730 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/notify_off.png | bin | 2147 -> 2147 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/notify_on.png | bin | 1506 -> 1506 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/play.png | bin | 1017 -> 1017 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/plugin.png | bin | 1663 -> 1663 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/star.png | bin | 4776 -> 4776 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/unlock.png | bin | 1375 -> 1375 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/icons/48/user.png | bin | 2269 -> 2269 bytes |
18 files changed, 0 insertions, 0 deletions
diff --git a/images/icons/48/add.png b/images/icons/48/add.png Binary files differindex 753ac4b68..753ac4b68 100755..100644 --- a/images/icons/48/add.png +++ b/images/icons/48/add.png diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png Binary files differindex 2835638a9..2835638a9 100755..100644 --- a/images/icons/48/delete.png +++ b/images/icons/48/delete.png diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png Binary files differindex 709fbb357..709fbb357 100755..100644 --- a/images/icons/48/edit.png +++ b/images/icons/48/edit.png diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png Binary files differindex 13d88f707..13d88f707 100755..100644 --- a/images/icons/48/feed.png +++ b/images/icons/48/feed.png diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png Binary files differindex 8bb12e96e..8bb12e96e 100755..100644 --- a/images/icons/48/gear.png +++ b/images/icons/48/gear.png diff --git a/images/icons/48/group.png b/images/icons/48/group.png Binary files differindex 26238ac6a..26238ac6a 100755..100644 --- a/images/icons/48/group.png +++ b/images/icons/48/group.png diff --git a/images/icons/48/info.png b/images/icons/48/info.png Binary files differindex 760eca5c3..760eca5c3 100755..100644 --- a/images/icons/48/info.png +++ b/images/icons/48/info.png diff --git a/images/icons/48/link.png b/images/icons/48/link.png Binary files differindex b32eec529..b32eec529 100755..100644 --- a/images/icons/48/link.png +++ b/images/icons/48/link.png diff --git a/images/icons/48/lock.png b/images/icons/48/lock.png Binary files differindex b9db282ac..b9db282ac 100755..100644 --- a/images/icons/48/lock.png +++ b/images/icons/48/lock.png diff --git a/images/icons/48/menu.png b/images/icons/48/menu.png Binary files differindex 376e60cab..376e60cab 100755..100644 --- a/images/icons/48/menu.png +++ b/images/icons/48/menu.png diff --git a/images/icons/48/notice.png b/images/icons/48/notice.png Binary files differindex f6fbc95c6..f6fbc95c6 100755..100644 --- a/images/icons/48/notice.png +++ b/images/icons/48/notice.png diff --git a/images/icons/48/notify_off.png b/images/icons/48/notify_off.png Binary files differindex 7c8cd9788..7c8cd9788 100755..100644 --- a/images/icons/48/notify_off.png +++ b/images/icons/48/notify_off.png diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png Binary files differindex 3275898c5..3275898c5 100755..100644 --- a/images/icons/48/notify_on.png +++ b/images/icons/48/notify_on.png diff --git a/images/icons/48/play.png b/images/icons/48/play.png Binary files differindex fce589370..fce589370 100755..100644 --- a/images/icons/48/play.png +++ b/images/icons/48/play.png diff --git a/images/icons/48/plugin.png b/images/icons/48/plugin.png Binary files differindex c74c6bf46..c74c6bf46 100755..100644 --- a/images/icons/48/plugin.png +++ b/images/icons/48/plugin.png diff --git a/images/icons/48/star.png b/images/icons/48/star.png Binary files differindex f53914efa..f53914efa 100755..100644 --- a/images/icons/48/star.png +++ b/images/icons/48/star.png diff --git a/images/icons/48/unlock.png b/images/icons/48/unlock.png Binary files differindex 9bf72a4c6..9bf72a4c6 100755..100644 --- a/images/icons/48/unlock.png +++ b/images/icons/48/unlock.png diff --git a/images/icons/48/user.png b/images/icons/48/user.png Binary files differindex c42410cd1..c42410cd1 100755..100644 --- a/images/icons/48/user.png +++ b/images/icons/48/user.png |
