Sachin Joshi 1d906ffa82 Merge branch 'develop' into match-file-name ... # Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2019-07-15 21:30:56 +05:45
..
mix	migrating task refactor	2019-07-15 15:45:27 +03:00
pleroma	Merge branch 'develop' into match-file-name	2019-07-15 21:30:56 +05:45
healthcheck.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
jason_types.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
transports.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
xml_builder.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00