Browse Source

Merge remote-tracking branch 'origin/feature/JIRA-287_queryPermission' into feature/jira-287_queryPermission

# Conflicts:
#	core
#	framework
tags/1.3.0^2
zhaoguangwei 5 years ago
parent
commit
6c3862716f
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      core
  2. +1
    -1
      framework

+ 1
- 1
core

@@ -1 +1 @@
Subproject commit c7428b2a78e15156ccb0714cbc42c68086db0df2
Subproject commit 53822bf005a7a29958d82c4c9cd18d24248fbca8

+ 1
- 1
framework

@@ -1 +1 @@
Subproject commit 09e373abb793f33771a7c2792e9967d9ca819bc5
Subproject commit 399ceeff4de82edd3ee93446c79cf32b1ba4cc59

Loading…
Cancel
Save