diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
commit | 70709a882594250684c954a21d186877ea6f983c (patch) | |
tree | ee2f364e513f8fd9fa1e12da8f5cd39c36d9b403 /view/theme/diabook/icons | |
parent | 509ed2604fe6860b83e02984f8b4a280496a22a8 (diff) | |
parent | 42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 (diff) | |
download | volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.gz volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.bz2 volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
view/de/strings.php
Diffstat (limited to 'view/theme/diabook/icons')
-rw-r--r-- | view/theme/diabook/icons/isstar.png | bin | 1277 -> 0 bytes |
-rwxr-xr-x | view/theme/diabook/icons/next.png | bin | 0 -> 300 bytes |
-rwxr-xr-x | view/theme/diabook/icons/notifications.png | bin | 758 -> 714 bytes |
-rwxr-xr-x | view/theme/diabook/icons/prev.png | bin | 0 -> 336 bytes |
-rwxr-xr-x | view/theme/diabook/icons/starred.png | bin | 1617 -> 501 bytes |
-rwxr-xr-x | view/theme/diabook/icons/unglobe.png | bin | 798 -> 0 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png Binary files differdeleted file mode 100644 index c955b25b5..000000000 --- a/view/theme/diabook/icons/isstar.png +++ /dev/null diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png Binary files differnew file mode 100755 index 000000000..7b5e25b90 --- /dev/null +++ b/view/theme/diabook/icons/next.png diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png Binary files differindex 5bdc34f76..270997740 100755 --- a/view/theme/diabook/icons/notifications.png +++ b/view/theme/diabook/icons/notifications.png diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png Binary files differnew file mode 100755 index 000000000..55c1464ba --- /dev/null +++ b/view/theme/diabook/icons/prev.png diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png Binary files differindex 72a49c157..2b82dfca3 100755 --- a/view/theme/diabook/icons/starred.png +++ b/view/theme/diabook/icons/starred.png diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png Binary files differdeleted file mode 100755 index aa9b0e189..000000000 --- a/view/theme/diabook/icons/unglobe.png +++ /dev/null |