diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-01-19 16:36:37 +0000 |
|---|---|---|
| committer | marcin mikołajczak <me@mkljczk.pl> | 2024-01-19 16:36:37 +0000 |
| commit | 250a4873a6f50f71cb5c387de46d711dc1bd1a39 (patch) | |
| tree | 15364aea4ca2ad364517099f090716de0900b8ef /installation | |
| parent | 51aef6b78dcf709872de32a02533e943f08858d4 (diff) | |
| parent | 81a13b4b9eb066e7827251c054eb04fd70613532 (diff) | |
| download | pleroma-250a4873a6f50f71cb5c387de46d711dc1bd1a39.tar.gz pleroma-250a4873a6f50f71cb5c387de46d711dc1bd1a39.zip | |
Merge branch 'develop' into 'post-languages'
# Conflicts:
# lib/pleroma/web/activity_pub/transmogrifier.ex
# test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/pleroma-mongooseim.cfg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/installation/pleroma-mongooseim.cfg b/installation/pleroma-mongooseim.cfg index 3ecba5641..6b568fd03 100755 --- a/installation/pleroma-mongooseim.cfg +++ b/installation/pleroma-mongooseim.cfg @@ -204,7 +204,7 @@ ]} ]}, - %% Following HTTP API is deprected, the new one abouve should be used instead + %% Following HTTP API is deprecated, the new one above should be used instead { {5288, "127.0.0.1"} , ejabberd_cowboy, [ {num_acceptors, 10}, @@ -824,7 +824,7 @@ %% Enable archivization for private messages (default) % {pm, [ - %% Top-level options can be overriden here if needed, for example: + %% Top-level options can be overridden here if needed, for example: % {async_writer, false} % ]}, @@ -834,7 +834,7 @@ %% % {muc, [ % {host, "muc.@HOST@"} - %% As with pm, top-level options can be overriden for MUC archive + %% As with pm, top-level options can be overridden for MUC archive % ]}, % %% Do not use a <stanza-id/> element (by default stanzaid is used) |