diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-17 16:53:14 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-17 16:53:14 -0700 |
| commit | 2540ecc0ac751cc77272dc7a05dd43dffeb15bbb (patch) | |
| tree | 357277d8deaec56b511283da28172cbe84f6c0cb /README.md | |
| parent | be701677d67642c546de10818104f813e3e3c82a (diff) | |
| parent | b49972a623ae8f021899e2732031ba585b79a4ac (diff) | |
| download | volse-hubzilla-2540ecc0ac751cc77272dc7a05dd43dffeb15bbb.tar.gz volse-hubzilla-2540ecc0ac751cc77272dc7a05dd43dffeb15bbb.tar.bz2 volse-hubzilla-2540ecc0ac751cc77272dc7a05dd43dffeb15bbb.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
README.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 1 |
1 files changed, 1 insertions, 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. |