modified:   templates/default/patchworks_view_edit_list.html
	modified:   templates/default/patchworks_view_main_init_2.html
Merge branch 'master' of github.com:zanjibar/patchworks

Conflicts:
	templates/default/patchworks_view_main_init_2.html

	modified:   patchs/3.php
	deleted:    templates/default/patchworks_view_main_init_2.html
	modified:   templates/default/patchworks_view_main_init_3.html
	modified:   templates/default/patchworks_view_main_login.html
	modified:   view/dicon.ini
	new file:   patchworks_view_main_init_2.html
Merge branch 'develop'
	modified:   language/japanese/main.ini
	modified:   templates/default/patchworks_view_edit_item.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_1.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_2.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_3.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_4.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_5.html
	copied:     templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_6.html
	renamed:    templates/default/patchworks_view_edit_item.html -> templates/default/patchworks_view_edit_item_7.html
	modified:   templates/default/patchworks_view_edit_list.html
	modified:   templates/default/patchworks_view_main_init.html
	modified:   view/edit/item/Item.class.php
	modified:   view/edit/list/List.class.php
	modified:   view/main/init/Init.class.php
ログイン時のみメッセージを表示
Merge pull request #4 from akagane99/develop

ログイン時のみメッセージを表示
	new file:   patches/1.php
	new file:   patches/2.php
	new file:   patches/3.php
	new file:   patches/4.php
	new file:   patches/5.php
	new file:   patches/6.php
	new file:   patches/7.php
	modified:   view/main/init/Init.class.php
	deleted:    patchs/1.php
	deleted:    patchs/2.php
	deleted:    patchs/3.php
	deleted:    patchs/4.php
	deleted:    patchs/5.php
	deleted:    patchs/6.php
	deleted:    patchs/7.php
	modified:   patches/5.php
	modified:   templates/default/patchworks_view_main_init_5.html
	modified:   view/dicon.ini
	modified:   view/main/init/Init.class.php
	modified:   view/maple.ini
	deleted:    patchs/1.php
	deleted:    patchs/2.php
	deleted:    patchs/3.php
	deleted:    patchs/4.php
	deleted:    patchs/5.php
	deleted:    patchs/6.php
	deleted:    patchs/7.php
	modified:   components/View.class.php
	modified:   patches/5.php
	modified:   templates/default/patchworks_view_main_init_5.html
	modified:   patches/5.php
	modified:   README.md
	modified:   templates/default/patchworks_view_edit_item_2.html
	modified:   templates/default/patchworks_view_edit_item_3.html
	modified:   install.ini
	new file:   patches/8.php
	new file:   patches/9.php
	modified:   templates/default/patchworks_view_edit_config.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_1.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_2.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_3.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_4.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_5.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_6.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_7.html
	copied:     templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_8.html
	renamed:    templates/default/patchworks_view_edit_config.html -> templates/default/patchworks_view_edit_config_9.html
	new file:   templates/default/patchworks_view_edit_item_8.html
	new file:   templates/default/patchworks_view_edit_item_9.html
	modified:   templates/default/patchworks_view_edit_list.html
	new file:   templates/default/patchworks_view_main_init_8.html
	new file:   templates/default/patchworks_view_main_init_9.html
	modified:   view/edit/config/Config.class.php
	modified:   view/edit/list/List.class.php
	modified:   view/edit/maple.ini
	modified:   language/japanese/main.ini
	modified:   templates/default/patchworks_view_edit_config_1.html
	modified:   patchworks_view_edit_item_2.html
	modified:   templates/default/patchworks_view_edit_item_2.html
Merge branch 'develop' of github.com:zanjibar/patchworks into develop
	modified:   sql/mysql/table.sql
	modified:   language/japanese/main.ini
	modified:   view/edit/maple.ini
	deleted:    patchs/1.php
	deleted:    patchs/2.php
	deleted:    patchs/3.php
	deleted:    patchs/4.php
	deleted:    patchs/5.php
	deleted:    patchs/6.php
	deleted:    patchs/7.php
	action/edit/base/
	templates/default/patchworks_view_edit_base.html
	view/edit/base/