Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 1 Jun 2019 03:26:05 +0000 (03:26 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 1 Jun 2019 03:26:05 +0000 (03:26 +0000)
commitd46cc7896e2434857cfd317709011f57c729877a
tree163a23387222c3e9efde4dea3d1fbb3ab8b64ead
parent88df6296891547b5730a99efafb9bae0090543b2
parent5d3ece2861b619c101d6860fbc1a80bfd8630ba7
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'

Bugfix: remove vanilla flavour

See merge request pleroma/pleroma!1228