Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ...

# Conflicts:
#	docs/config.md
#	test/support/factory.ex

2019-04-08 12:20:26 +03:00

..

mix/tasks/pleroma

Generate permissive or restrictive robots.txt in the config generator

2019-04-03 22:12:58 +05:45

pleroma

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

2019-04-08 12:20:26 +03:00

jason_types.ex

…

transports.ex

…

xml_builder.ex

…