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)
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508

1  2 
lib/pleroma/user.ex
lib/pleroma/web/router.ex

Simple merge
Simple merge