diff options
author | kaniini <nenolod@gmail.com> | 2018-11-27 23:20:12 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-11-27 23:20:12 +0000 |
commit | 7049ed593698b46a14d8f88537d470b3a306f79b (patch) | |
tree | 079e13f4f1b5ce9a02b45e28c59d5c0bfb09c5a8 /test | |
parent | 02e43d44d34b3fbe3e3d3d0eaf350e0208464f14 (diff) | |
parent | 4a019827b2a911fc9217e3ec57170e3fb6336600 (diff) | |
download | pleroma-7049ed593698b46a14d8f88537d470b3a306f79b.tar.gz |
Merge branch 'revert-02e43d44' into 'develop'
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
See merge request pleroma/pleroma!481
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions