Merge branch '394_user_tags' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 7 Dec 2018 18:25:38 +0000 (18:25 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 7 Dec 2018 18:25:38 +0000 (18:25 +0000)
commit94d8f1ab305b513931b81d7a4b3e41e30b688a16
treebeed6b2eb88909f74a6747e2131e827def7b584f
parentda4315b5ef643f07376f159df6fd41636e07e01d
parent1cea97df646566bfd6e31d9696047ba87f1e82c1
Merge branch '394_user_tags' into 'develop'

[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
lib/pleroma/user.ex
lib/pleroma/web/router.ex