projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccc2cf0 ecd1ef8)
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)
1  2 
docs/dev.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc docs/dev.md
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git