Merge branch 'documentation/mastalab' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 26 Jan 2019 14:10:42 +0000 (14:10 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 26 Jan 2019 14:10:42 +0000 (14:10 +0000)
commitc00fba4f7dcf10c49bf1fa03be348e7c99a3fc47
tree9c8dd46230d9883b6e0d2e4da1547a1f4277c8f4
parentb050d27c2d667d3c61e2c5716d26971f24b4bc5c
parent18b80be5ee0ad420afaa4637c8fca0de96f3c03e
Merge branch 'documentation/mastalab' into 'develop'

README: Mastalab officially supports Pleroma.

See merge request pleroma/pleroma!713