diff options
author | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
commit | 8b39d6f93cc6f9aecc76d67a686087366c3c50fd (patch) | |
tree | 39e31c70233a4702b479666dd1fcf23c1b5f19ba /lib/pleroma/web | |
parent | e3b4a3e96b2ffbc6d920155cd41687414045d4d6 (diff) | |
parent | 17b8896c40fa1c4aaab96f82fd07d5f5f2698400 (diff) | |
download | pleroma-8b39d6f93cc6f9aecc76d67a686087366c3c50fd.tar.gz |
Merge branch 'master-to-stable' into 'develop'
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
Diffstat (limited to 'lib/pleroma/web')
0 files changed, 0 insertions, 0 deletions