Merge branch 'angristan-docker' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 9 Dec 2018 13:53:20 +0000 (13:53 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 9 Dec 2018 13:53:20 +0000 (13:53 +0000)
commitcf85a9aea1949677a092c0ebc6c0e17475346632
treea574b381214110fb5bfa1f6b74467cf4361d2f4e
parent5436aaad4f5c60c93c35a827d7e7fb93903b9e0b
parent88e463e79773e1ff94c8d88333d1f15c62ce2e19
Merge branch 'angristan-docker' into 'develop'

Update angristan/docker-pleroma URL in README

See merge request pleroma/pleroma!526