fix merge
This commit is contained in:
parent
5de0395059
commit
8ffe73c7e3
|
@ -2,6 +2,8 @@ changelog
|
||||||
|
|
||||||
=== next
|
=== next
|
||||||
|
|
||||||
|
+ deluser command.
|
||||||
|
|
||||||
+ Configurable avatar colors.
|
+ Configurable avatar colors.
|
||||||
|
|
||||||
+ Optional pleroma color scheme for the home sick...
|
+ Optional pleroma color scheme for the home sick...
|
||||||
|
@ -34,8 +36,6 @@ changelog
|
||||||
|
|
||||||
+ Add cite tag for block quote attributions.
|
+ Add cite tag for block quote attributions.
|
||||||
|
|
||||||
+ deluser command.
|
|
||||||
|
|
||||||
+ @media print styles.
|
+ @media print styles.
|
||||||
|
|
||||||
+ Disable overscroll (pull down) refresh.
|
+ Disable overscroll (pull down) refresh.
|
||||||
|
|
Loading…
Reference in New Issue