Merge develop into feature/770-add-emoji-tags
[akkoma] / CC-BY-SA-4.0
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-03-31 Haelwenn (lanodan... CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license