projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a14d15 7130e9d)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 2 Apr 2018 11:15:38 +0000 (13:15 +0200)
committerlain <lain@soykaf.club>
Mon, 2 Apr 2018 11:15:38 +0000 (13:15 +0200)
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