Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ...

# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex

2020-03-14 15:37:02 +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-14 15:37:02 +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