aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-09-17 21:30:58 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-09-17 21:30:58 +0000
commit40c968626dde499969d90f256d5ef6d1b1d5e2b4 (patch)
tree91068aebccdfc1ac40b8e332507d3bad07c8ed4e /lib/pleroma/web/common_api
parentf758e663b233a4a773bd58479f2f2c2bc02c47ef (diff)
parentea6d4137dac60ae23e15ab29901a84d8468baf3e (diff)
downloadpleroma-40c968626dde499969d90f256d5ef6d1b1d5e2b4.tar.gz
Merge branch 'chore/changelog-separate-1.1' into 'develop'
Sync develop changelog with master and create a new section for post-1.1 changes See merge request pleroma/pleroma!1689
Diffstat (limited to 'lib/pleroma/web/common_api')
0 files changed, 0 insertions, 0 deletions