Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ...

# Conflicts:
#	lib/pleroma/instances/instance.ex

2020-09-11 17:19:58 +03:00

..

mix

remove validate_expires_at from enqueue method

2020-09-10 21:52:31 +03:00

pleroma

Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy

2020-09-11 17:19:58 +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