Merge branch 'release/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:57:18 +0000 (09:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Apr 2017 13:57:18 +0000 (09:57 -0400)
commit0f92954726514144f1fe4d5c03617a4ac2eae527
treee2139b83b5bf7115b717e0c64788fa729d6082a0
parent4097607ca14d19531f6627c4ca676cb9c943c9e9
parent98f53dd0b8258aed23d772910465b7cbe1b4f50f
Merge branch 'release/1.0.6'

Conflicts:
css/app.css