templates/juser · b61286891fe71a1eabdec70eac4e8e54ee08604f · ops / jumpserver · GitLab

History Find file

Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · d369d4b5
liuzheng712 authored Nov 07, 2015
```
# Conflicts:
#	jumpserver/views.py
#	juser/models.py
#	juser/views.py
#	templates/jperm/perm_apply.html
```
d369d4b5

Name	Last commit	Last update
..
change_info.html		Loading commit data...
forget_password.html		Loading commit data...
group_add.html		Loading commit data...
group_detail.html		Loading commit data...
group_edit.html		Loading commit data...
group_list.html		Loading commit data...
profile.html		Loading commit data...
reset_password.html		Loading commit data...
user_add.html		Loading commit data...
user_detail.html		Loading commit data...
user_edit.html		Loading commit data...
user_list.html		Loading commit data...