diff options
author | kaniini <ariadne@dereferenced.org> | 2019-08-24 16:01:57 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-08-24 16:01:57 +0000 |
commit | 83aeb6090072986d39dc52de05f5a23164f8ce04 (patch) | |
tree | 1f510711f7bad7b69df9d3c2d01f3663d4e126fb /test/web/admin_api/admin_api_controller_test.exs | |
parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
parent | 1d7033d96289edf0adf2ca61a725f93b345305ec (diff) | |
download | pleroma-83aeb6090072986d39dc52de05f5a23164f8ce04.tar.gz pleroma-83aeb6090072986d39dc52de05f5a23164f8ce04.zip |
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
0 files changed, 0 insertions, 0 deletions