xiaokong1937@gmail.com a3096689b5 Merge branch 'xiaoyu'		2016-09-06 19:14:16 +08:00
..
templates/users	temp commit	2016-09-06 16:40:44 +08:00
templatetags	merge master	2016-09-03 23:01:36 +08:00
tests	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
__init__.py	Rename dir name dashboard to apps	2016-08-13 21:59:08 +08:00
api.py	temp commit	2016-09-06 16:40:44 +08:00
apps.py	add asset add	2016-09-03 19:05:50 +08:00
forms.py	Merge with cmdb	2016-09-06 15:09:00 +08:00
models.py	change date_added -> date_created	2016-09-06 16:50:19 +08:00
serializers.py	temp commit	2016-09-06 16:40:44 +08:00
urls.py	Merge branch 'xiaoyu'	2016-09-06 19:14:16 +08:00
utils.py	Merge with cmdb	2016-09-06 15:09:00 +08:00
views.py	change date_added -> date_created	2016-09-06 16:50:19 +08:00