diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-02-03 13:05:20 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-02-03 13:05:20 +0000 |
| commit | 61c16193decca80c4021039a674edb77c7bf6158 (patch) | |
| tree | a3b7b01400f4981f3d49cf77f207f4ab0d296422 /priv | |
| parent | 9a9766d6489024fb725197af1461944252aae9ed (diff) | |
| parent | c8a29315495190c27f86b7331aa18c24e8fe9fcc (diff) | |
| download | pleroma-61c16193decca80c4021039a674edb77c7bf6158.tar.gz pleroma-61c16193decca80c4021039a674edb77c7bf6158.zip | |
Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/static/images/avi.png (renamed from priv/static/static/avi.png) | bin | 3604 -> 3604 bytes |
| -rw-r--r-- | priv/static/images/banner.png (renamed from priv/static/static/banner.png) | bin | 1293 -> 1293 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/priv/static/static/avi.png b/priv/static/images/avi.png Binary files differindex 336fd15ef..336fd15ef 100644 --- a/priv/static/static/avi.png +++ b/priv/static/images/avi.png diff --git a/priv/static/static/banner.png b/priv/static/images/banner.png Binary files differindex 467c075d6..467c075d6 100644 --- a/priv/static/static/banner.png +++ b/priv/static/images/banner.png |
