volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	Deleted old versions that have been integrated. Integrated and slightly ↵	Andrew Manning	2017-01-01	1	-61/+0
\| \| \| \|	revised Comanche doco.
*	Corrected some missing space typos in docs	Andrew Manning	2015-09-17	1	-3/+3
\|
*	Started correcting vestiges of the RedMatrix and matrix, replacing with ↵	Andrew Manning	2015-09-16	1	-15/+15
\| \| \| \|	Hubzilla and grid
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/DerivedTheme1.md doc/Developers.md doc/Features.md doc/Plugins.md doc/Privacy.md doc/README.md doc/Remove-Account.md doc/Translations.md doc/about.bb doc/account_basics.bb doc/accounts_profiles_channels_basics.bb doc/addons.bb doc/addons_gnusocial.bb doc/bbcode.html doc/campaign.bb doc/classRedmatrix_1_1Import_1_1Import-members.html doc/classRedmatrix_1_1Import_1_1Import.html doc/cloud.bb doc/connecting_to_channels.bb doc/connecting_to_channels.md doc/credits.bb doc/de/channels.bb doc/de/features.bb doc/de/main.bb doc/de/registration.bb doc/developers.bb doc/encryption.bb doc/external-resource-links.bb doc/extra_features.bb doc/faq_admins.bb doc/faq_developers.bb doc/faq_members.bb doc/features.bb doc/hidden_configs.bb doc/history.md doc/html/index.php doc/main.bb doc/permissions.bb doc/plugins.bb doc/problems-following-an-update.bb doc/profiles.bb doc/red2pi.bb doc/registration.bb doc/roadmap.bb doc/sv/main.bb doc/what_is_zot.bb doc/zot.md
\| *	remove project name dependency from most of the doc files to ease project ↵	redmatrix	2015-05-13	1	-2/+2
\| \| \| \| \| \| \| \|	merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* \|	second pass name change	redmatrix	2015-05-05	1	-2/+2
\| \|
* \|	first pass name change	redmatrix	2015-05-05	1	-1/+1
\|/
*	update resource links	friendica	2015-04-01	1	-1/+1
\|
*	merge madness	friendica	2014-10-19	1	-1/+1
\|
*	Doc update	Thomas Willingham	2014-02-27	1	-4/+4
\|
*	Import doco from docs@friendicared.net	Thomas Willingham	2014-02-24	1	-0/+61