Merge branch 'move-backend-images' into 'develop'

Browse source

Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60

...

This commit is contained in:

lambda 2018-02-03 13:05:20 +00:00

parent 9a9766d648 c8a2931549

commit 61c16193de

6 changed files with 15 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

priv/static/static/avi.png → priv/static/images/avi.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

0

priv/static/static/banner.png → priv/static/images/banner.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB