projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e428979 e07f8f8)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
authorlain <lain@soykaf.club>
Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)
committerlain <lain@soykaf.club>
Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/application.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/application.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git