diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-03-08 12:29:02 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-03-08 12:29:02 +0000 |
| commit | 460062f2b04220ffcd8f20aa842cc95582d1f849 (patch) | |
| tree | f56c298bed6b289aa2dd81766862265ccef05947 /installation/pleroma.nginx | |
| parent | 0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (diff) | |
| parent | 611ca385dea3d611a97579000311cc42684305e6 (diff) | |
| download | pleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.tar.gz pleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.zip | |
Merge branch 'feature/activitypub' into 'develop'
Feature/activitypub
See merge request pleroma/pleroma!67
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions