git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a9b2ad1 60b4b0d)

author	Roger Braun <roger@rogerbraun.net>
	Sun, 7 May 2017 17:28:23 +0000 (19:28 +0200)
committer	Roger Braun <roger@rogerbraun.net>
	Sun, 7 May 2017 17:28:23 +0000 (19:28 +0200)
commit	b403ea4d2b69cef4434ad68babdfb402d8227847
tree	d07607b3387c89f4310881132a9e10a5389a5439	tree \| snapshot
parent	a9b2ad17596d1b6deca646239a95e94dc644ebf3	commit \| diff
parent	60b4b0d725aefdca3eedd2d7708b0c96ee60c5f4	commit \| diff

Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

12 files changed:

lib/pleroma/user.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/ostatus/activity_representer.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/ostatus/ostatus.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/representers/activity_representer.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api.ex	diff1 \|	diff2 \|	blob \| history
test/support/factory.ex	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/ostatus/activity_representer_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_test.exs	diff1 \|	diff2 \|	blob \| history

Fork of https://akkoma.dev/AkkomaGang/akkoma.git