diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 18:03:20 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 18:03:20 -0700 |
commit | f0f5a8f2b510b92aa1fde2cbaf118a784c154432 (patch) | |
tree | 618e360ae9103f57815c15f9c5724cd5dd885fe0 | |
parent | 0563ce93a1ba3df8e5282e047603b21bb190c43f (diff) | |
parent | 6a927be76cd30cbe72e20c4de5a1f607befdac4b (diff) | |
download | volse-hubzilla-f0f5a8f2b510b92aa1fde2cbaf118a784c154432.tar.gz volse-hubzilla-f0f5a8f2b510b92aa1fde2cbaf118a784c154432.tar.bz2 volse-hubzilla-f0f5a8f2b510b92aa1fde2cbaf118a784c154432.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r-- | app/grid.apd | 4 | ||||
-rw-r--r-- | app/matrix.apd | 4 | ||||
-rw-r--r-- | app/matrix.png | bin | 3925 -> 0 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/grid.apd b/app/grid.apd new file mode 100644 index 000000000..bc77aa6f1 --- /dev/null +++ b/app/grid.apd @@ -0,0 +1,4 @@ +url: $baseurl/network +requires: local_channel +name: Grid +photo: $baseurl/images/hubzilla_logo_6.png diff --git a/app/matrix.apd b/app/matrix.apd deleted file mode 100644 index 68188bfd3..000000000 --- a/app/matrix.apd +++ /dev/null @@ -1,4 +0,0 @@ -url: $baseurl/network -requires: local_channel -name: Matrix -photo: $baseurl/app/matrix.png diff --git a/app/matrix.png b/app/matrix.png Binary files differdeleted file mode 100644 index aba2c35dd..000000000 --- a/app/matrix.png +++ /dev/null |