lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md		2019-04-08 09:18:01 +00:00
..
mix/tasks/pleroma	Generate permissive or restrictive robots.txt in the config generator	2019-04-03 22:12:58 +05:45
pleroma	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'	2019-04-08 09:18:01 +00:00
jason_types.ex
transports.ex
xml_builder.ex