diff options
| author |  Leon Sandøy <[email protected]> | 2018-11-20 13:10:59 +0100 |
|---|---|---|
| committer | Leon Sandøy <[email protected]> | 2018-11-20 13:10:59 +0100 |
| commit | 05e35b2ccbd5ce81e4035e8bd889c5188d865c0f (patch) | |
| tree | 534301dcb9b69a694c5b3d78f4865c2810c7ad4d /bot/resources | |
| parent | Merge branch 'master' of github.com:python-discord/seasonalbot (diff) | |
| parent | Add whitespace. (diff) | |
Solved merge conflicts
Diffstat (limited to 'bot/resources')
| -rw-r--r-- | bot/resources/halloween/bat-clipart.png | bin | 0 -> 12313 bytes |
| -rw-r--r-- | bot/resources/halloween/bloody-pentagram.png | bin | 0 -> 7006 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bot/resources/halloween/bat-clipart.png b/bot/resources/halloween/bat-clipart.png Binary files differnew file mode 100644 index 00000000..7df26ba9 --- /dev/null +++ b/bot/resources/halloween/bat-clipart.png diff --git a/bot/resources/halloween/bloody-pentagram.png b/bot/resources/halloween/bloody-pentagram.png Binary files differnew file mode 100644 index 00000000..4e6da07a --- /dev/null +++ b/bot/resources/halloween/bloody-pentagram.png |
