Merge branch 'feature/NewSettings' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:04:54 +0000 (12:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:04:54 +0000 (12:04 -0400)
commit032db9de1f2fd098dfc860557db85f536d1c7671
tree759bc0bf59bfdc227ca60ecfc1293f69fb26f163
parentb35673f9fc743a8f83c048ed33c2a7000ee9cbd6
parent412032449c75f6e7c24d8d15656bd4d4b54694ac
Merge branch 'feature/NewSettings' into develop