Merge branch 'master' into AE/groupFixes
commit32b6a89de8b7c6d13450b7d6a27a846252ec4a03
authorBrady Miller <brady.g.miller@gmail.com>
Wed, 15 Mar 2017 07:13:34 +0000 (15 00:13 -0700)
committerGitHub <noreply@github.com>
Wed, 15 Mar 2017 07:13:34 +0000 (15 00:13 -0700)
tree062a052ce41a5a0767471af7778692d0eacc11f8
parent52a7a196ab408ade3c197d8029f63b8bf309e053
parentf44e3568b0f896d216d65e480c8148b1ad80beff
Merge branch 'master' into AE/groupFixes
interface/main/left_nav.php
interface/therapy_groups/therapy_groups_views/listGroups.php