projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52b0413 a6fd9c4)
Merge branch 'patch-3' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 29 May 2018 10:58:43 +0000 (10:58 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 29 May 2018 10:58:43 +0000 (10:58 +0000)
Update pleroma.nginx

See merge request pleroma/pleroma!179


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git