diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /images | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'images')
| -rw-r--r-- | images/ghash-32.png | bin | 0 -> 1824 bytes | |||
| -rw-r--r-- | images/redmatrix_logo.svg | 2 | ||||
| -rw-r--r-- | images/rm.svg | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/images/ghash-32.png b/images/ghash-32.png Binary files differnew file mode 100644 index 000000000..6b4913b82 --- /dev/null +++ b/images/ghash-32.png diff --git a/images/redmatrix_logo.svg b/images/redmatrix_logo.svg index cb98a7fb5..840c3e624 100644 --- a/images/redmatrix_logo.svg +++ b/images/redmatrix_logo.svg @@ -14,7 +14,7 @@ id="svg3053" version="1.1" inkscape:version="0.48.4 r9939" - sodipodi:docname="redmatrix.svg"> + sodipodi:docname="hubzilla.svg"> <defs id="defs3055" /> <sodipodi:namedview diff --git a/images/rm.svg b/images/rm.svg index 903a5c894..c056a621e 100644 --- a/images/rm.svg +++ b/images/rm.svg @@ -15,7 +15,7 @@ version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="hashlogo.svg" - inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/redmatrix/assets/hashlogo2.png" + inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/hubzilla/assets/hashlogo2.png" inkscape:export-xdpi="156.42857" inkscape:export-ydpi="156.42857"> <defs |
