Linked Applications
Loading…
Stash
Projects
Repositories
View all public repositories
Help
Online help
Keyboard shortcuts
Log In
parkhyeonsoo
CMSKoreaERP
Public
fork of
제품
/
CMSKoreaERP
HTTP
Learn more about cloning repositories
You have
read-only
access
Clone
Files
Commits
Branches
78f77af
+
15b9500
8b8ec9b3b7b6cd48284adb97e5972d68f25e6f99
Merge
ShinHyunjin
committed
8b8ec9b
30 Sep 2016
Merge branch 'task/CE-36' of
ssh://git@192.168.0.50:7999/product/cmskoreaerp.git into task/CE-36
Conflicts:
application/views/scripts/regist-book/receiver/list.phtml
application/views/scripts/regist-book/sender/list.phtml
Showing diff to
78f77af
ShinHyunjin
committed
78f77af
30 Sep 2016
CE-36 접수대장 작업중...
Worker-216
committed
15b9500
30 Sep 2016
CE-36 1. 기존 접수리스트 url (regist-list/...)으로 작업하던 것을 regist-book/... 으로 교정
Changed files