Skip to content
GitLab
Explore
Sign in
Extensions
configitems
Repository
configitems
CRM
Civiconfig
Entity
Group.php
Find file
Blame
History
Permalink
Merge branch 'master' into 1-smart_groups
· 7ed19e00
Johan Vervloet
authored
Jun 07, 2016
Conflicts: CRM/Civiconfig/Entity/Group.php
7ed19e00