diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-29 19:21:27 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-29 19:21:27 +0300 |
| commit | 1838f739d10571d48d5d4c43dbab2f5687ce3ab3 (patch) | |
| tree | 4f417dbcc651d317318b3eba6268ec430e3de9c8 /docs/configuration/howto_mongooseim.md | |
| parent | ba9635eec02887e89f4cff7e805ff02f69e14e9d (diff) | |
| parent | 0e0a6aef70fc0cac1f9176e4f50a7fe4930242fa (diff) | |
| download | pleroma-1838f739d10571d48d5d4c43dbab2f5687ce3ab3.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into oauth-form
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/templates/layout/app.html.eex
Diffstat (limited to 'docs/configuration/howto_mongooseim.md')
0 files changed, 0 insertions, 0 deletions