一時コミット
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
	app/views/inquiries/index.html.erb
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
tt
アップはしない
処理期日の時間の削除を完了しました。
Merge pull request #32 from aratomo1224/Sprint3

処理期日の時間の削除を完了しました。
9/6画面日本語修正(1)
修正適用分です
Merge pull request #33 from matu0813/master

9/6画面日本語修正(1)
Merge branch 'master' of https://github.com/yada-ITA/csc into Sprint3

Conflicts:
	app/views/inquiries/show.html.erb
Merge branch 'branch090601' of https://github.com/myama2630/csc into myama2630-branch090601

Conflicts:
	app/views/inquiries/index.html.erb
9/6Validationttanto変更
Merge branch 'master' of https://github.com/yada-ITA/csc into branch6
表示の日本語化
テーマ適用分
Merge branch 'branch2' of https://github.com/7016fuji/csc into 7016fuji-branch2

Conflicts:
	app/views/inquiries/show.html.erb
Merge branch 'branch090601' of https://github.com/myama2630/csc into myama2630-branch090601

Conflicts:
	app/views/layouts/application.html.erb