firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' into sns

Browse Source 
Conflicts:
	bbs/register_form_update.php
	config.php
	extend/.htaccess
	plugin/kcp/kcpcert.head.skin.php
	skin/board/basic/view_comment.skin.php
This commit is contained in:
gnuboard
2013-05-21 16:06:07 +09:00
parent 811f9a8893 18b5212c86
commit b1b747646b
121 changed files with 1707 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extend/.htaccess
View File

@ -1 +1,5 @@
#
<<<<<<< HEAD
#
=======
# .htaccess
>>>>>>> master