Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
Y
YX_IDENT_REFACTORING
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • zhangyusheng
  • YX_IDENT_REFACTORING
  • Repository

Switch branch/tag
  • YX_IDENT_REFACTORING
  • src
  • main
  • resources
  • static
  • dialogs
  • updatePerms.html
Find file
BlameHistoryPermalink
  • Administrator's avatar
    Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 9bf5fff5
    Administrator authored Dec 24, 2018
    # Conflicts:
    #	src/main/resources/static/tpl/layout/permissionList/permissionList.html
    #	src/main/resources/static/tpl/layout/permissionList/permissionList.js
    #	src/main/resources/static/tpl/layout/userList/userList.js
    9bf5fff5
updatePerms.html 1.44 KB
EditWeb IDE

Replace updatePerms.html

Attach a file by drag & drop or click to upload


Cancel
A new branch will be created in your fork and a new merge request will be started.