diff options
author | lain <lain@soykaf.club> | 2020-12-23 14:08:08 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-12-23 14:08:08 +0000 |
commit | ce1be8f5e6feabee4acac376dce23f0ec18e62ec (patch) | |
tree | 77a15bc9f7c0e1e5c2ae3db99a5ec81ed22d60bc /mix.lock | |
parent | c5cce89f501d920591170c0348cc427b1cc58ece (diff) | |
parent | ae934659d1ade1b5c5c4ab13aae5a56246cce3a5 (diff) | |
download | pleroma-ce1be8f5e6feabee4acac376dce23f0ec18e62ec.tar.gz |
Merge branch 'mergeback/2.2.1' into 'develop'
Mergeback/2.2.1
See merge request pleroma/pleroma!3215
Diffstat (limited to 'mix.lock')
0 files changed, 0 insertions, 0 deletions