Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:syssqu/sigohaka
Merge branch 'master' of github.com:syssqu/sigohaka
Merge branch 'master' of github.com:syssqu/sigohaka
勤務状況報告書の印刷イメージを修正
勤務状況報告書のレイアウトを変更する
modify minor upgrade
modify minor upgrade
modify minor upgrade
レイアウト調整中
勤務状況報告書のレイアウト修正
Merge remote-tracking branch 'origin/vacation-2'
Merge remote-tracking branch 'origin/transport'

Conflicts:
	app/assets/stylesheets/style.css.scss
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into transport
modify minor upgrade
modify minor upgrade
勤務状況報告書