Resolve merge conflicts
[akkoma] / docs / config / howto_mongooseim.md
2019-06-01 rinpatchResolve merge conflicts
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop'
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into...
2019-05-22 kaniiniMerge branch 'mongooseim-support' into 'develop'
2019-05-21 lainMongooseIM: Add documentation.