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

Browse Source

Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html

...

This commit is contained in:

czaks

2013-08-03 19:05:25 -04:00

parent 7d5fef9ace a3fbff2259

commit a0855cdcf5

22 changed files with 1304 additions and 1107 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

1047

inc/config.php

File diff suppressed because it is too large Load Diff