Commit 7e04965a authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'jsalyers-missed-updates' into 'develop' 

[JES] Just use the list for now while still investigating config info on settings page

See merge request !254
parents 54b2d1e9 00928753
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment