fix merge

This commit is contained in:
Ted Unangst 2019-12-10 18:14:50 -05:00
parent 5de0395059
commit 8ffe73c7e3
1 changed files with 2 additions and 2 deletions

View File

@ -2,6 +2,8 @@ changelog
=== next
+ deluser command.
+ Configurable avatar colors.
+ Optional pleroma color scheme for the home sick...
@ -34,8 +36,6 @@ changelog
+ Add cite tag for block quote attributions.
+ deluser command.
+ @media print styles.
+ Disable overscroll (pull down) refresh.