Commit Graph

2 Commits

Author SHA1 Message Date
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
Maksim fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00