Merge branch 'master' into 'update_readme'

# Conflicts:
#   README.md

index.json

+{"homeserver_url":"https://matrix.org","packs":["matrix-stickers/packs/aoppoid/aoppoid.json","matrix-stickers/packs/apple-flower/apple-flower.json","matrix-stickers/packs/autres/autres.json","matrix-stickers/packs/bloodborne-gif/bloodborne-gif.json","matrix-stickers/packs/bluerabredcat/bluerabredcat.json","matrix-stickers/packs/crop/crop.json","matrix-stickers/packs/eliteactu/eliteactu.json","matrix-stickers/packs/fachosphere/fachosphere.json","matrix-stickers/packs/francais/francais.json","matrix-stickers/packs/japanesekitty/japanesekitty.json","matrix-stickers/packs/jvc/jvc.json","matrix-stickers/packs/larry/larry.json","matrix-stickers/packs/logh/logh.json","matrix-stickers/packs/madoka-magica/madoka-magica.json","matrix-stickers/packs/madokamisc/madokamisc.json","matrix-stickers/packs/magia-record/magia-record.json","matrix-stickers/packs/pack-hanayo/pack-hanayo.json","matrix-stickers/packs/pack-hii/pack-hii.json","matrix-stickers/packs/pepe/pepe.json","matrix-stickers/packs/pepetop/pepetop.json","matrix-stickers/packs/pikachudetective/pikachudetective.json","matrix-stickers/packs/popocolorin/popocolorin.json","matrix-stickers/packs/prettysailormoon/prettysailormoon.json","matrix-stickers/packs/pusheen02/pusheen02.json","matrix-stickers/packs/pusheen/pusheen.json","matrix-stickers/packs/qlf/qlf.json","matrix-stickers/packs/raoult/raoult.json","matrix-stickers/packs/risitas/risitas.json","matrix-stickers/packs/shotacollectionpack/shotacollectionpack.json","matrix-stickers/packs/weeb/weeb.json","matrix-stickers/packs/wojak/wojak.json","matrix-stickers/packs/xanaduavici/xanaduavici.json"]}
\ No newline at end of file