608 Commits (ed35ac2930c7baca87c2b48931b8dcee60e0f747)

Author	SHA1	Message	Date
wangyong	42012d7bfe	merge master	2016-09-16 17:32:35 +08:00
wangyong	792908eb35	asset add	2016-09-16 17:23:23 +08:00
ibuler	bb8852d57e	Modify some style	2016-09-15 12:20:53 +08:00
ibuler	30fd51c268	Asset group detail	2016-09-06 21:39:21 +08:00
ibuler	25d9dbe93c	Merge with cmdb	2016-09-06 15:09:00 +08:00
ibuler	7241f7509f	Update nav	2016-09-05 20:27:44 +08:00
ibuler	8827fd2d74	Modify translation	2016-09-05 20:17:45 +08:00
ibuler	a0ef3cfc34	Update locale dir name to zh	2016-09-05 19:17:18 +08:00