Merge branch 'grouptyperework' of git+ssh://git.mahara.org/git/mahara into grouptyperework
Conflicts: htdocs/lib/view.php htdocs/view/groupviews.php
Please register or sign in to comment
Conflicts: htdocs/lib/view.php htdocs/view/groupviews.php