akkoma/lib
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
#	test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
..
mix Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' 2020-03-11 15:16:18 +00:00
pleroma Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-12 12:07:07 +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