Clement Ho 15cdc8bfc8 Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/groups/group_members/index.html.haml		2018-05-11 13:51:58 +00:00
..
_new_group_member.html.haml	…
index.html.haml	Merge branch 'master' into 'bootstrap4'	2018-05-11 13:51:58 +00:00