diff options
| author | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
| commit | 1aa522e138d45b7e06223d0cebb4a4363d9dda5b (patch) | |
| tree | 880a1adfe1a66ead083f66b00720bb1c5175f674 /inc/instance-config.php | |
| parent | 88c1205e422b314cae2c0410ce21f9c8283f0f0e (diff) | |
| parent | 46edec0f2d8c31b55e36e160c7d9bac8bf4d3aa4 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/index.html
templates/post_thread.html
templates/thread.html
Diffstat (limited to 'inc/instance-config.php')
0 files changed, 0 insertions, 0 deletions