Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: README.md
This commit is contained in:
commit
2540ecc0ac
@ -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.
|
||||
|
9151
util/messages.po
9151
util/messages.po
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user