Commit 9c56b398 authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'develop' into 'witness-description-owner-fields' 

# Conflicts:
#   src/app/components/modules/Settings.jsx
parents 5f9dced8 51b1b2e9
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