Merge branch 'patch-2' into 'develop'
authorlain <lain@soykaf.club>
Fri, 14 Jun 2019 09:42:04 +0000 (09:42 +0000)
committerlain <lain@soykaf.club>
Fri, 14 Jun 2019 09:42:04 +0000 (09:42 +0000)
commitf045d1437cb9e1e53565c4f35be2c7ca3a9d73ff
tree21c0e3bd0487d7e070b0ce3656921696bf02b329
parent28cb9edde9638c0773d48ba6fc03667393e15a15
parent58a094b605212c5cea70f17602a7e2ebd4dec296
Merge branch 'patch-2' into 'develop'

Add copyright info to containment.ex

See merge request pleroma/pleroma!1286