Commit e0aa220e authored by Robert Palm's avatar Robert Palm

Merge branch 'cafeteria_time_format' into 'master'

Cafeteria time format

Closes #174

See merge request !411
parents 3d692dba b8eae304
Pipeline #52184 passed with stages
in 9 minutes and 2 seconds