• redmatrix's avatar
    Merge branch 'master' of https://github.com/redmatrix/redmatrix · 51b89f0e
    redmatrix authored
    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
    51b89f0e