projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5677b21 aa26dc6)
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
authorstwf <steven.fuchs@dockyard.com>
Wed, 3 Jun 2020 21:25:53 +0000 (17:25 -0400)
committerstwf <steven.fuchs@dockyard.com>
Wed, 3 Jun 2020 21:25:53 +0000 (17:25 -0400)
# Conflicts:
# lib/pleroma/web/preload/status_net.ex

1  2 
config/config.exs patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git