diff options
| author | lain <lain@soykaf.club> | 2019-04-08 14:10:43 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-04-08 14:10:43 +0200 |
| commit | 5d871173d189a0019fda0ee76f8a324d90a163ee (patch) | |
| tree | c3e423993ff5289dd0ba73a94881bd52d9cda1c2 /installation/pleroma.nginx | |
| parent | 037fefe21871ee0a1926286c87c334ea1d339394 (diff) | |
| parent | aac48d0cc6893c231c88d5cd7fe0334353bbf299 (diff) | |
| download | pleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.tar.gz pleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.zip | |
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions