diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
| commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
| tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /web/static | |
| parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
| parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
| download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip | |
Fixing merge conflict
Diffstat (limited to 'web/static')
| -rw-r--r-- | web/static/images/filesOverlay.png | bin | 0 -> 8392 bytes |
| -rw-r--r-- | web/static/images/logoWhite.png | bin | 0 -> 5876 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/web/static/images/filesOverlay.png b/web/static/images/filesOverlay.png Binary files differnew file mode 100644 index 000000000..d24da7626 --- /dev/null +++ b/web/static/images/filesOverlay.png diff --git a/web/static/images/logoWhite.png b/web/static/images/logoWhite.png Binary files differnew file mode 100644 index 000000000..11bbd4632 --- /dev/null +++ b/web/static/images/logoWhite.png |
