summaryrefslogtreecommitdiff
path: root/priv/static
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-29 13:54:10 +0000
committerkaniini <nenolod@gmail.com>2019-01-29 13:54:10 +0000
commitd03a116654bd7c4329b698a0f175e37aea8c2caa (patch)
treeb5ea94fb5a001d3b2d3858921c480f8f58fb077b /priv/static
parentebb3496386c1e195b48bcdc9d72c4c30e60fe340 (diff)
parentf53d464db0194eb66557b00c7d92b9df8c798ada (diff)
downloadpleroma-d03a116654bd7c4329b698a0f175e37aea8c2caa.tar.gz
pleroma-d03a116654bd7c4329b698a0f175e37aea8c2caa.zip
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700
Diffstat (limited to 'priv/static')
-rw-r--r--priv/static/images/city.jpgbin0 -> 3191646 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/priv/static/images/city.jpg b/priv/static/images/city.jpg
new file mode 100644
index 000000000..c32204719
--- /dev/null
+++ b/priv/static/images/city.jpg
Binary files differ