dev version 1 (w/o sms & email)
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
adhoc setting
conflict
conflict
resolve conflict
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
integrate new DB
integrate new DB
AED timetable updated
sms disabled
Merge branch 'dev-YangWei' of https://github.com/mehere/RTSS.git into dev-YangWei
sms disabled
Merge branch 'dev-YangWei' of https://github.com/mehere/RTSS.git into dev-YangWei
AED timetable updated
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei