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

Conflicts: README.md
2015-10-17 16:53:14 -07:00
parent be701677d6 b49972a623
commit 2540ecc0ac
2 changed files with 9152 additions and 0 deletions
@@ -6,6 +6,7 @@ Hubzilla - Community Server
 Help us redefine the web - using integrated and united community websites. 
 --------------------------------------------------------------------------

+
 **What are Hubs?**

 Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.