Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

This commit is contained in:
Roger Braun 2016-11-26 19:12:44 +01:00
commit a994e794cc

View file

@ -3,3 +3,4 @@ Contributors of this project.
- Constance Variable (lambadalambda@social.heldscal.la): Code
- Coco Snuss (cocosnuss@social.heldscal.la): Code
- wakarimasen (wakarimasen@soykaf.com): NSFW hiding image
- dtluna (dtluna@social.heldscal.la): Code