projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 261ec82 502cb38)
Merge branch 'feld/pleroma-feld-mastodon-usersearch' into develop
authorRoger Braun <roger@rogerbraun.net>
Mon, 30 Oct 2017 18:25:32 +0000 (19:25 +0100)
committerRoger Braun <roger@rogerbraun.net>
Mon, 30 Oct 2017 18:25:32 +0000 (19:25 +0100)

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