projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99c0a11 b12f306)
Merge branch 'develop' into feature/tag_feed
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 27 Jan 2020 18:13:13 +0000 (21:13 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 27 Jan 2020 18:13:13 +0000 (21:13 +0300)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
test/user_test.exs patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc test/user_test.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git