diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
| commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
| tree | 44962a914b86cf66a1da49300f12986db49f010e /web/static/images | |
| parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
| parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
| download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip | |
Fixing merge
Diffstat (limited to 'web/static/images')
| -rwxr-xr-x | web/static/images/bootstrap-colorpicker/alpha-horizontal.png | bin | 0 -> 3635 bytes |
| -rwxr-xr-x | web/static/images/bootstrap-colorpicker/alpha.png | bin | 0 -> 3271 bytes |
| -rwxr-xr-x | web/static/images/bootstrap-colorpicker/hue-horizontal.png | bin | 0 -> 2837 bytes |
| -rwxr-xr-x | web/static/images/bootstrap-colorpicker/hue.png | bin | 0 -> 2972 bytes |
| -rwxr-xr-x | web/static/images/bootstrap-colorpicker/saturation.png | bin | 0 -> 8817 bytes |
| -rw-r--r-- | web/static/images/themes/dark.png | bin | 0 -> 75371 bytes |
| -rw-r--r-- | web/static/images/themes/mattermost.png | bin | 0 -> 66828 bytes |
| -rw-r--r-- | web/static/images/themes/slack.png | bin | 0 -> 68603 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/web/static/images/bootstrap-colorpicker/alpha-horizontal.png b/web/static/images/bootstrap-colorpicker/alpha-horizontal.png Binary files differnew file mode 100755 index 000000000..d0a65c08b --- /dev/null +++ b/web/static/images/bootstrap-colorpicker/alpha-horizontal.png diff --git a/web/static/images/bootstrap-colorpicker/alpha.png b/web/static/images/bootstrap-colorpicker/alpha.png Binary files differnew file mode 100755 index 000000000..38043f1c8 --- /dev/null +++ b/web/static/images/bootstrap-colorpicker/alpha.png diff --git a/web/static/images/bootstrap-colorpicker/hue-horizontal.png b/web/static/images/bootstrap-colorpicker/hue-horizontal.png Binary files differnew file mode 100755 index 000000000..a0d9add8e --- /dev/null +++ b/web/static/images/bootstrap-colorpicker/hue-horizontal.png diff --git a/web/static/images/bootstrap-colorpicker/hue.png b/web/static/images/bootstrap-colorpicker/hue.png Binary files differnew file mode 100755 index 000000000..d89560e99 --- /dev/null +++ b/web/static/images/bootstrap-colorpicker/hue.png diff --git a/web/static/images/bootstrap-colorpicker/saturation.png b/web/static/images/bootstrap-colorpicker/saturation.png Binary files differnew file mode 100755 index 000000000..594ae50ed --- /dev/null +++ b/web/static/images/bootstrap-colorpicker/saturation.png diff --git a/web/static/images/themes/dark.png b/web/static/images/themes/dark.png Binary files differnew file mode 100644 index 000000000..832f64d2e --- /dev/null +++ b/web/static/images/themes/dark.png diff --git a/web/static/images/themes/mattermost.png b/web/static/images/themes/mattermost.png Binary files differnew file mode 100644 index 000000000..4a321adcb --- /dev/null +++ b/web/static/images/themes/mattermost.png diff --git a/web/static/images/themes/slack.png b/web/static/images/themes/slack.png Binary files differnew file mode 100644 index 000000000..dc70c7dc2 --- /dev/null +++ b/web/static/images/themes/slack.png |
