diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-24 19:38:54 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-24 19:38:54 -0400 |
| commit | 8a6c407282fe10f676f08f21e28647a5c8794e11 (patch) | |
| tree | b5a5bc5881bf5b35cdb52bb997498ef36a391720 /view/theme/diabook/icons | |
| parent | 803f79e0912c4a526a16fdda4809277d8ad3195d (diff) | |
| parent | 3ae43c24487450a749942ef4c3c19fa2a61461b6 (diff) | |
| download | volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.tar.gz volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.tar.bz2 volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
prevent duplicate friend suggestions
block filed items from deletion
add the bang
network filter is now a permission group
small fix in css
add right_aside to diabook-blue
add connectable services to right_aside
add PostIt to right_aside, fixes in css
* master:
Diffstat (limited to 'view/theme/diabook/icons')
| -rw-r--r-- | view/theme/diabook/icons/StatusNet.png | bin | 0 -> 1257 bytes |
| -rw-r--r-- | view/theme/diabook/icons/email.png | bin | 0 -> 880 bytes |
| -rw-r--r-- | view/theme/diabook/icons/facebook.png | bin | 0 -> 1082 bytes |
| -rw-r--r-- | view/theme/diabook/icons/livejournal.png | bin | 0 -> 2029 bytes |
| -rw-r--r-- | view/theme/diabook/icons/posterous.png | bin | 0 -> 2783 bytes |
| -rw-r--r-- | view/theme/diabook/icons/tumblr.png | bin | 0 -> 938 bytes |
| -rw-r--r-- | view/theme/diabook/icons/twitter.png | bin | 0 -> 964 bytes |
| -rw-r--r-- | view/theme/diabook/icons/wordpress.png | bin | 0 -> 1693 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook/icons/StatusNet.png b/view/theme/diabook/icons/StatusNet.png Binary files differnew file mode 100644 index 000000000..398bca716 --- /dev/null +++ b/view/theme/diabook/icons/StatusNet.png diff --git a/view/theme/diabook/icons/email.png b/view/theme/diabook/icons/email.png Binary files differnew file mode 100644 index 000000000..240cef2c3 --- /dev/null +++ b/view/theme/diabook/icons/email.png diff --git a/view/theme/diabook/icons/facebook.png b/view/theme/diabook/icons/facebook.png Binary files differnew file mode 100644 index 000000000..3e5dd39c3 --- /dev/null +++ b/view/theme/diabook/icons/facebook.png diff --git a/view/theme/diabook/icons/livejournal.png b/view/theme/diabook/icons/livejournal.png Binary files differnew file mode 100644 index 000000000..6d27d265e --- /dev/null +++ b/view/theme/diabook/icons/livejournal.png diff --git a/view/theme/diabook/icons/posterous.png b/view/theme/diabook/icons/posterous.png Binary files differnew file mode 100644 index 000000000..c8e86078e --- /dev/null +++ b/view/theme/diabook/icons/posterous.png diff --git a/view/theme/diabook/icons/tumblr.png b/view/theme/diabook/icons/tumblr.png Binary files differnew file mode 100644 index 000000000..1dc7fa072 --- /dev/null +++ b/view/theme/diabook/icons/tumblr.png diff --git a/view/theme/diabook/icons/twitter.png b/view/theme/diabook/icons/twitter.png Binary files differnew file mode 100644 index 000000000..b7a687b9f --- /dev/null +++ b/view/theme/diabook/icons/twitter.png diff --git a/view/theme/diabook/icons/wordpress.png b/view/theme/diabook/icons/wordpress.png Binary files differnew file mode 100644 index 000000000..f564c4300 --- /dev/null +++ b/view/theme/diabook/icons/wordpress.png |
