Merge branch 'patch-2' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 03:50:36 +0000 (03:50 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 27 Sep 2019 03:50:36 +0000 (03:50 +0000)
commitc4fbb56984d8f86df948cfd9b0f7c081d688c365
treee757f5feb8a8fe122b32e6a0ea94780a286c2dcd
parent0e280354d9c425ecaa02cb582fcb051536c8181b
parent880307e0d52444326eee8e79b2f66af706d85b4a
Merge branch 'patch-2' into 'develop'

Minor corrections and clarification for Alpine standard v.3.10

See merge request pleroma/pleroma!1594