Commit 2ad7970f authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'jsalyers-revert-change-that-shouldnt-be-in-develop' into 'develop' 

Revert "Merge branch 'jes2850-decentralized-lists' into 'develop'"

See merge request !142
parents 9eed3685 c2cce1d6
Expand all 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