projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbb19d0 e4f1d8f)
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 26 Dec 2020 19:23:05 +0000 (22:23 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 26 Dec 2020 19:23:05 +0000 (22:23 +0300)
1  2 
lib/pleroma/object.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
test/pleroma/web/mastodon_api/views/status_view_test.exs patch | diff1 | diff2 | blob | history

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