git.squeep.com Git - akkoma/commit

author	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 30 Sep 2019 12:10:54 +0000 (19:10 +0700)
committer	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 30 Sep 2019 12:10:54 +0000 (19:10 +0700)
commit	e7aef27c0011d3fd0b569ebdb9196a1e011eae5d
tree	2cfe7b23d75256ccde619b6cc1b4b6a9f813dfc8	tree \| snapshot
parent	3f0e276ac94589d860c7e4c95d3661fa494f4361	commit \| diff

Fix merge

22 files changed:

lib/pleroma/list.ex		diff \| blob \| history
lib/pleroma/web/admin_api/views/report_view.ex		diff \| blob \| history
lib/pleroma/web/chat_channel.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex	[new file with mode: 0644]	blob
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/list_controller.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/search_controller.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/status_controller.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/views/account_view.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/views/conversation_view.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/views/notification_view.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/views/status_view.ex		diff \| blob \| history
lib/pleroma/web/router.ex		diff \| blob \| history
test/list_test.exs		diff \| blob \| history
test/web/admin_api/views/report_view_test.exs		diff \| blob \| history
test/web/mastodon_api/controllers/account_controller_test.exs	[new file with mode: 0644]	blob
test/web/mastodon_api/mastodon_api_controller_test.exs		diff \| blob \| history
test/web/mastodon_api/views/account_view_test.exs		diff \| blob \| history
test/web/mastodon_api/views/notification_view_test.exs		diff \| blob \| history
test/web/mastodon_api/views/status_view_test.exs		diff \| blob \| history
test/web/twitter_api/twitter_api_test.exs		diff \| blob \| history

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

RSS Atom