f3c26671af
Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
css | ||
fonts | ||
img | ||
js | ||
scss | ||
bower.json | ||
GNUmakefile | ||
Gruntfile.js | ||
package.json |
f3c26671af
Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
css | ||
fonts | ||
img | ||
js | ||
scss | ||
bower.json | ||
GNUmakefile | ||
Gruntfile.js | ||
package.json |