projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c2e4f8 fb2040d)
Merge branch 'develop' into use-jobs-in-webpush
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/application.ex patch | diff1 | diff2 | blob | history

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