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

2

stylesheets/dark_roach.css

File diff suppressed because one or more lines are too long