diff options
| author | czaks <marcin@6irc.net> | 2013-08-28 12:41:36 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-28 12:41:36 -0400 |
| commit | 8503e65858ce3145a11f8daec4104e3a7249c889 (patch) | |
| tree | c619ac3da567cacb96ed9b95a75bb3c1cbbcc87a /stylesheets/img | |
| parent | 753b67aa71963f32ec3c3bc7c18f53bb00f2e4f8 (diff) | |
| parent | 7a4e481333c3ab39ea63c2d961a7c05016b12460 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/functions.php
install.php
stylesheets/dark_roach.css
Diffstat (limited to 'stylesheets/img')
| -rw-r--r-- | stylesheets/img/dark_roach_bg.png | bin | 0 -> 13292 bytes |
| -rw-r--r-- | stylesheets/img/dark_roach_top.png | bin | 0 -> 2886 bytes |
| -rw-r--r--[-rwxr-xr-x] | stylesheets/img/rect820.png | bin | 38261 -> 38261 bytes |
| -rw-r--r--[-rwxr-xr-x] | stylesheets/img/rect821.png | bin | 38762 -> 38762 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/stylesheets/img/dark_roach_bg.png b/stylesheets/img/dark_roach_bg.png Binary files differnew file mode 100644 index 00000000..5cc59dff --- /dev/null +++ b/stylesheets/img/dark_roach_bg.png diff --git a/stylesheets/img/dark_roach_top.png b/stylesheets/img/dark_roach_top.png Binary files differnew file mode 100644 index 00000000..bdfc1ff9 --- /dev/null +++ b/stylesheets/img/dark_roach_top.png diff --git a/stylesheets/img/rect820.png b/stylesheets/img/rect820.png Binary files differindex c0a16c18..c0a16c18 100755..100644 --- a/stylesheets/img/rect820.png +++ b/stylesheets/img/rect820.png diff --git a/stylesheets/img/rect821.png b/stylesheets/img/rect821.png Binary files differindex a24cbf13..a24cbf13 100755..100644 --- a/stylesheets/img/rect821.png +++ b/stylesheets/img/rect821.png |
