Zain Fauzan Rofie Azizi 4694ddbbf1 fixed merged conflicts

2018-07-17 11:11:06 +08:00

..

factories

redo contact test, added contact factory

2018-07-02 16:50:18 +08:00

migrations

Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact

2018-07-07 17:24:36 +08:00

seeds

fixed merged conflicts

2018-07-17 11:11:06 +08:00

.gitignore

init

2018-04-16 15:37:03 +08:00