projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f2bf3e 611ca38)
Merge branch 'feature/activitypub' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 8 Mar 2018 12:29:02 +0000 (12:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 8 Mar 2018 12:29:02 +0000 (12:29 +0000)
Feature/activitypub

See merge request pleroma/pleroma!67


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