jumpserver/jperm
guanghongwei 80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei
Conflicts:
	jperm/models.py
2015-03-11 18:00:55 +08:00
..
__init__.py ÐÞ¸Äjpermistion --> jperm Ãû³Æ 2015-01-24 14:46:35 +08:00
admin.py ÐÞ¸Äjpermistion --> jperm Ãû³Æ 2015-01-24 14:46:35 +08:00
models.py ½ñÌì¾ÍÕâÑù°É 2015-03-11 17:59:15 +08:00
tests.py ÐÞ¸Äjpermistion --> jperm Ãû³Æ 2015-01-24 14:46:35 +08:00
urls.py ½ñÌì¾ÍÕâÑù°É 2015-03-11 17:59:15 +08:00
views.py Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei 2015-03-11 18:00:55 +08:00