Skip to content
Commit e6273f6d authored by David Metzler's avatar David Metzler
Browse files

Merge branch '8.x-1.x' into 8.x-dev-ui 

Conflicts:
	forena_ui/src/Controller/ForenaUI.php
parents 88868dbf 25afcc04
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment