Merge branch 'master' of github.com:gnuboard/g4s

Browse Source

Conflicts:
	head.sub.php

...

This commit is contained in:

gnuboard

2013-01-14 13:16:34 +09:00

parent c0ecb1cdec 0ce3006c13

commit e8b23b29e9

6 changed files with 13 additions and 7 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

adm/img/logo.png Normal file

Binary file not shown.

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

BIN

adm/img/logo_bg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 420 B

BIN

adm/img/top_bg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 146 B