Skip to content
Commit e043086f authored by trantzas's avatar trantzas
Browse files

Merge branch 'generic_controller' into 'develop' 

Generic controller

See merge request !16
parents 776fe82f a5a460d5
Show 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