summaryrefslogtreecommitdiff
path: root/priv/static
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-26 15:58:49 +0200
committerlain <lain@soykaf.club>2020-08-26 15:58:49 +0200
commit5dba3a50fcdb673473315ec9e425e1cf5ad52c3e (patch)
tree60a8c52d8df1bf596ac44a47580354efba436153 /priv/static
parentfc42446755d5284a2406633358ab8edfa8c0ab0c (diff)
parent6f17aea066498bf070f0decb3ac0508c6b04e3b8 (diff)
downloadpleroma-5dba3a50fcdb673473315ec9e425e1cf5ad52c3e.tar.gz
pleroma-5dba3a50fcdb673473315ec9e425e1cf5ad52c3e.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
Diffstat (limited to 'priv/static')
0 files changed, 0 insertions, 0 deletions