Merge branch 'master' into development

Browse Source

# Conflicts:
#	opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java

pull/19/head

Parker 2 years ago

parent 346e51ea62 0dfe674a4f

commit e647493227

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available