Skip to content
Snippets Groups Projects
Commit 2d0ddabd authored by aboeckle's avatar aboeckle
Browse files

Merge branch 'devel_vfsAdminGUI' into devel_courseEnrolmentGroupOrder

Conflicts:
	src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
parents da7137b6 9ff3ee22
No related branches found
No related tags found
No related merge requests found
Showing
with 1587 additions and 75 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment