aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-07 19:24:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-07 19:24:36 +0200
commit3f9e39a9e3d72681056475fe60b193ef78caf536 (patch)
tree0fe9c6bcbcc48ccbcceb0a31a95c10fae7207f28 /doc
parentb51bcba26398a90f9d29d7ced2615a88040a6aac (diff)
parent862bfbdd2bc60b201918d02351f2591ccf5aea04 (diff)
downloadvolse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.gz
volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.bz2
volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
-rw-r--r--doc/Primary-Directory.md (renamed from doc/Primary-Directory)0
-rw-r--r--doc/main.bb1
2 files changed, 0 insertions, 1 deletions
diff --git a/doc/Primary-Directory b/doc/Primary-Directory.md
index 37b0c0431..37b0c0431 100644
--- a/doc/Primary-Directory
+++ b/doc/Primary-Directory.md
diff --git a/doc/main.bb b/doc/main.bb
index d71f819b2..4428b152b 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,4 +1,3 @@
-[img][baseurl]/assets/hashlogo.png[/img]
[zrl=[baseurl]/help/about][b]What is the $Projectname?[/b][/zrl]
$Projectname is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.