# Conflicts:
#	abweb/js/operationList/operationList.js

Feature/1.0 check web dev kdh 2

See merge request !34

Merge branch 'feature/1.0_check_web_dev_kdh_2' of gitlab.agentec.jp:abook_web/check into feature/1.0_check_web_dev_kdh_2

# Conflicts:
#	abweb/js/operationList/operationList.js

change url path for develop server

See merge request !33

# Conflicts:
#   abweb/js/pickup/pickup.js

implement switch list view

# Conflicts:
#	abweb/common/css/newdash/app.css
#	abweb/common/js/header.js
#	abweb/html/common/header.html
#	abweb/html/index.html
#	abweb/js/operationList/operationList.js
#	abweb/js/topPage/topPage.js

Add missing code

See merge request !30

implement main title for send message screen

See merge request !32

# Conflicts:
#	abweb/html/common/header.html

implement main title for message detail screen

See merge request !31

Feature/1.0 check web dev kdh 2

See merge request !29

# Conflicts:
#	abvw/common/js/header.js
#	abweb/common/header.html
#	abweb/html/index.html

Feature/1.0 check web dev imai

See merge request !25

# Conflicts:
#	abweb/html/dashboard.html
#	abweb/html/push-message-list.html
#	abweb/js/dashboard/dashboard.js

Feature/1.0 check web dev 50265

See merge request !23

This reverts commit 9b8745f7.