Merge branch 'master' into h2.contribute

Merge main into H2 Contribute
This commit is contained in:
Fede.- 2022-01-03 13:29:20 -03:00
commit 0cd6be4aff
236 changed files with 37 additions and 15 deletions

View File

@ -1,6 +1,6 @@
---
title: Social Network
subtitle: "DisHub - Settings, basics, permission"
subtitle: "Pleroma"
icon: fa-asterisk
published: true
taxonomy:
@ -8,15 +8,15 @@ taxonomy:
- docs
- topic
tags:
- dishub
- nomad
- hubzilla
- fediverse
- pleroma
- fe
page-toc:
active: false
---
# DisHub: Disroot's Hubzilla Instance
# Disroot's Pleroma Instance
Introduction to **Dishub/Hubzilla** and **Nomad** - Mobile app for DisHub
Soon to come!
<br>
<br>

View File

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View File

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 241 KiB

View File

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Some files were not shown because too many files have changed in this diff Show More