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 committed 2013-08-28 12:41:36 -04:00

2 parents 753b67aa71 7a4e481333

commit 8503e65858

21 files changed

+231 -50

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

No files matched your search

stylesheets/img/dark_roach_bg.png

BIN

Binary file not shown.

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

stylesheets/img/dark_roach_top.png

BIN

Binary file not shown.

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

stylesheets/img/rect820.png

Executable → Regular

File mode changed.

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

stylesheets/img/rect821.png

Executable → Regular

File mode changed.

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