Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 16:43:55 +0000 (16:43 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 16:43:55 +0000 (16:43 +0000)
commit93701c3399add8af2d4a5d43b6f171d84655a533
tree2e54301d65b5fde59bea68552af28a69124aa40e
parentcef4337f950cca5ca9c9dec313efeb8f43aa5a40
parent26f265fb0e22ee7b7f4e9e1df4240283f5db3a9a
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'

remove CC-BY-NC-ND license.

See merge request pleroma/pleroma!1415