diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-06-11 11:19:45 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-06-11 11:19:45 +0000 |
commit | 7f79b467b1b56ce9ac7f544aaa2b687dcae341c5 (patch) | |
tree | 5c2b067d132fda185016982e1a8a1445eff0ce7d /installation/pleroma.nginx | |
parent | 45a935f0bd86501d64be7f453c08a47e46565ef9 (diff) | |
parent | 29c9c8d93b263e57915158d09761bc6586826798 (diff) | |
download | pleroma-7f79b467b1b56ce9ac7f544aaa2b687dcae341c5.tar.gz pleroma-7f79b467b1b56ce9ac7f544aaa2b687dcae341c5.zip |
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions