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