Merge https://github.com/redmatrix/hubzilla into pending_merge

2015-10-14 18:03:20 -07:00 · 2015-10-14 18:03:20 -07:00 · f0f5a8f2b5
commit f0f5a8f2b5
parent 0563ce93a1 6a927be76c
3 changed files with 4 additions and 4 deletions
--- a/app/grid.apd
+++ b/app/grid.apd
@ -0,0 +1,4 @@
+url: $baseurl/network
+requires: local_channel
+name: Grid
+photo: $baseurl/images/hubzilla_logo_6.png
--- a/app/matrix.apd
+++ b/app/matrix.apd
@ -1,4 +0,0 @@
-url: $baseurl/network
-requires: local_channel
-name: Matrix
-photo: $baseurl/app/matrix.png
--- a/app/matrix.png
+++ b/app/matrix.png