aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/websub/websub_controller.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-23 13:25:04 +0000
committerkaniini <nenolod@gmail.com>2019-01-23 13:25:04 +0000
commit4a278cd80a02fa1882db17397bb97b155c76570e (patch)
tree71587880a2568c96d6e391debbe3ee4e9d3dbc1c /lib/pleroma/web/websub/websub_controller.ex
parentabb349bde0d79cecf98898e82fbda746231c5373 (diff)
parent97412d9f94ed55caecb7a35e1f95aef7bdf0db19 (diff)
downloadpleroma-4a278cd80a02fa1882db17397bb97b155c76570e.tar.gz
Merge branch 's3-namespace' into 'develop'
S3 uploader: support for namespaced bucket Closes #532 See merge request pleroma/pleroma!699
Diffstat (limited to 'lib/pleroma/web/websub/websub_controller.ex')
0 files changed, 0 insertions, 0 deletions