liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ ... # Conflicts: # jumpserver/views.py # juser/models.py # juser/views.py # templates/jperm/perm_apply.html		2015-11-07 09:37:10 +08:00
..
css	完成webtermial demo	2015-11-05 18:31:00 +08:00
font-awesome	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
fonts	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
img	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
js	Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-07 09:37:10 +08:00