5 Commits

Author	SHA1	Message	Date
Harry Bomrah	dd4c9fc587	Merge branch 'master' into nccu ... Conflicts: .gitignore	2014-11-13 16:48:09 +08:00
rulingcom	63b08335fa	sdk changes	2014-11-12 19:00:18 +08:00
nccu	2c6bdd4bac	nccu branch	2014-11-07 16:06:50 +08:00
rulingcom	14402d44fa	Update design by Ray	2014-06-30 17:06:22 +08:00
Harry Bomrah	a72d5fbb48	change in parser and new template for 4.5 ... Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb	2014-05-02 18:26:21 +08:00