Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse source

Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css

...

This commit is contained in:

czaks 2013-08-28 12:41:36 -04:00

parent 753b67aa71 7a4e481333

commit 8503e65858

21 changed files with 231 additions and 50 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

stylesheets/img/dark_roach_bg.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 13 KiB

BIN

stylesheets/img/dark_roach_top.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

0

stylesheets/img/rect820.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 37 KiB After Width:  |  Height:  |  Size: 37 KiB

0

stylesheets/img/rect821.png Executable file → Normal file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 38 KiB After Width:  |  Height:  |  Size: 38 KiB