aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-02-29 14:58:37 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-02-29 14:58:37 +0100
commitb71a3af4570ccf349804b9ffa151fc1d35287d88 (patch)
tree264c012a0c8ca28c4035666d35c547a829968a2a /README
parentf5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff)
parentfb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff)
downloadvolse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.gz
volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.bz2
volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.zip
Merge remote-tracking branch 'friendica/master' into randomerror
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 4 insertions, 0 deletions
diff --git a/README b/README
index e69de29bb..152d481ea 100644
--- a/README
+++ b/README
@@ -0,0 +1,4 @@
+Friendica Social Communications Server
+======================================
+
+Welcome to the free social web.