summary refs log tree commit diff
path: root/changelog.d/67.misc
blob: 0a2095e4d45af28657999afe2c4b862867f3a612 (plain) (blame)
1
Merge mainline Synapse v1.21.2 into 'dinsic'.