diff options
| author | Malf Furious <m@lfurio.us> | 2015-12-18 23:18:33 -0500 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2015-12-18 23:18:33 -0500 |
| commit | 9068e6916ad68194fce2518ab5841af1c8949f3d (patch) | |
| tree | 2f91e9e3be00c1492cdf4ce88d8e77a909c5c287 /app/assets | |
| parent | 2ebdbaa48f10d6a6f5a1b78f4ef2c5433e50c8cf (diff) | |
| parent | b21251ef971d262dc414869fed83f52d0098bfe6 (diff) | |
| download | scrott-9068e6916ad68194fce2518ab5841af1c8949f3d.tar.gz scrott-9068e6916ad68194fce2518ab5841af1c8949f3d.zip | |
Merge branch 'framework' into dev
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/img/.gitkeep | 0 | ||||
| -rw-r--r-- | app/assets/img/amy.png | bin | 69547 -> 0 bytes | |||
| -rw-r--r-- | app/assets/img/eggman.png | bin | 102190 -> 0 bytes | |||
| -rw-r--r-- | app/assets/img/knuckles.png | bin | 77600 -> 0 bytes | |||
| -rw-r--r-- | app/assets/img/sonic.png | bin | 169301 -> 0 bytes | |||
| -rw-r--r-- | app/assets/img/tails.png | bin | 185686 -> 0 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/img/.gitkeep b/app/assets/img/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/img/.gitkeep diff --git a/app/assets/img/amy.png b/app/assets/img/amy.png Binary files differdeleted file mode 100644 index 493fb13..0000000 --- a/app/assets/img/amy.png +++ /dev/null diff --git a/app/assets/img/eggman.png b/app/assets/img/eggman.png Binary files differdeleted file mode 100644 index 6fea441..0000000 --- a/app/assets/img/eggman.png +++ /dev/null diff --git a/app/assets/img/knuckles.png b/app/assets/img/knuckles.png Binary files differdeleted file mode 100644 index 7c7b7e2..0000000 --- a/app/assets/img/knuckles.png +++ /dev/null diff --git a/app/assets/img/sonic.png b/app/assets/img/sonic.png Binary files differdeleted file mode 100644 index db3559f..0000000 --- a/app/assets/img/sonic.png +++ /dev/null diff --git a/app/assets/img/tails.png b/app/assets/img/tails.png Binary files differdeleted file mode 100644 index 8639790..0000000 --- a/app/assets/img/tails.png +++ /dev/null |
