projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd234a5 cfad4f4)
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 15 Sep 2020 17:29:39 +0000 (20:29 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 15 Sep 2020 17:29:39 +0000 (20:29 +0300)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history
config/description.exs patch | diff1 | diff2 | blob | history

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