diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-06-22 11:27:21 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-06-22 11:27:21 -0800 |
| commit | 9c32ab2f87077f680154a066d61b8b461099d591 (patch) | |
| tree | 0f8a9e42abf1e688b39f7d5dec8030f7303f0e6d /web | |
| parent | a3b10d0b0181c3f8b1950fc1556994bdc51a5445 (diff) | |
| parent | ec6cc84f2b71e0580b641e23057f359a5e40c2d8 (diff) | |
| download | chat-9c32ab2f87077f680154a066d61b8b461099d591.tar.gz chat-9c32ab2f87077f680154a066d61b8b461099d591.tar.bz2 chat-9c32ab2f87077f680154a066d61b8b461099d591.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web')
| -rw-r--r-- | web/static/images/salamander.jpg | bin | 17687 -> 0 bytes |
| -rw-r--r-- | web/static/images/test.png | bin | 1549 -> 279591 bytes |
| -rwxr-xr-x | web/static/images/testgif.gif | bin | 0 -> 38689 bytes |
| -rwxr-xr-x | web/static/images/testjpg.jpg | bin | 0 -> 70920 bytes |
| -rw-r--r-- | web/static/images/toothless.gif | bin | 163454 -> 0 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/web/static/images/salamander.jpg b/web/static/images/salamander.jpg Binary files differdeleted file mode 100644 index e841b12d5..000000000 --- a/web/static/images/salamander.jpg +++ /dev/null diff --git a/web/static/images/test.png b/web/static/images/test.png Binary files differindex 7d95d80e5..d8a9513d8 100644 --- a/web/static/images/test.png +++ b/web/static/images/test.png diff --git a/web/static/images/testgif.gif b/web/static/images/testgif.gif Binary files differnew file mode 100755 index 000000000..83d5eed72 --- /dev/null +++ b/web/static/images/testgif.gif diff --git a/web/static/images/testjpg.jpg b/web/static/images/testjpg.jpg Binary files differnew file mode 100755 index 000000000..025c8c581 --- /dev/null +++ b/web/static/images/testjpg.jpg diff --git a/web/static/images/toothless.gif b/web/static/images/toothless.gif Binary files differdeleted file mode 100644 index 8c269c131..000000000 --- a/web/static/images/toothless.gif +++ /dev/null |
