diff options
| author | feld <feld@feld.me> | 2021-04-15 14:59:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-04-15 14:59:26 +0000 |
| commit | 0a7c2a32badc8520d90146d5a1aae7907a679614 (patch) | |
| tree | 13a41747e2452ec5d3bf6128b090c37257985f2c /rel | |
| parent | 765f0907dfa9371038188ee35fc3b241be796d26 (diff) | |
| parent | 0ba8efc9500d55a3e26a8f0a66a8f425b1436881 (diff) | |
| download | pleroma-0a7c2a32badc8520d90146d5a1aae7907a679614.tar.gz | |
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions