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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-8/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-7/+7
\| \| \| \| \| \| \| \|	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	-1/+1
\| \|
* \|	first pass name change	redmatrix	2015-05-05	1	-6/+6
\|/
*	this brings us up to date	friendica	2015-01-06	1	-1/+1
\|
*	add main_footer include to all .md files except TOS and README	zottel	2014-12-08	1	-2/+1
\|
*	make it a bit personal	friendica	2014-11-12	1	-3/+3
\|
*	ok, I think I'll give it a break now.	friendica	2014-11-12	1	-6/+8
\|
*	minor word tweaks	friendica	2014-11-12	1	-3/+3
\|
*	wordsmith	friendica	2014-11-12	1	-1/+1
\|
*	more minor wordsmithing	friendica	2014-11-12	1	-2/+2
\|
*	Some dates couldn't be verified without going way back in the archives so at ↵	friendica	2014-11-12	1	-3/+3
\| \| \| \|	least make this document accurate based on what I have in front of me.
*	History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff.	friendica	2014-11-12	1	-0/+48