xiaokong1937@gmail.com a3096689b5 Merge branch 'xiaoyu'

2016-09-06 19:14:16 +08:00

..

assets

change date_added -> date_created

2016-09-06 16:50:19 +08:00

audits

add asset add

2016-09-03 19:05:50 +08:00

common

Merge branch 'master' into cmdb

2016-09-04 16:39:27 +08:00

fixtures

Update initial data: fixtures dir

2016-09-05 19:41:34 +08:00

jumpserver

Update locale dir name to zh

2016-09-05 19:17:18 +08:00

locale/zh/LC_MESSAGES

Merge with cmdb

2016-09-06 15:09:00 +08:00

media/avatar

add asset add

2016-09-03 19:05:50 +08:00

ops

add asset add

2016-09-03 19:05:50 +08:00

perms

add asset add

2016-09-03 19:05:50 +08:00

static

temp commit

2016-09-06 16:40:44 +08:00

templates

temp commit

2016-09-06 16:40:44 +08:00

users

Merge branch 'xiaoyu'

2016-09-06 19:14:16 +08:00

webterminal

add asset add

2016-09-03 19:05:50 +08:00

__init__.py

add asset add

2016-09-03 19:05:50 +08:00

manage.py

update

2016-09-04 07:04:15 +08:00