sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2025-01-16 04:09:55 +01:00
Code Issues Releases Wiki Activity
pleroma/lib
History
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs
2020-05-13 12:42:36 +03:00
..
mix
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
pleroma
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-13 12:42:36 +03:00
jason_types.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
transports.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
xml_builder.ex
Update Copyrights
2020-03-03 16:44:49 -06:00