Project

General

Profile

« Previous | Next » 

Revision a784f00f

Added by Katja Luther about 14 years ago

merge cate-development2 branch with trunk

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java
28 28
import org.hibernate.search.annotations.Field;
29 29
import org.hibernate.search.annotations.Index;
30 30
import org.hibernate.search.annotations.Indexed;
31
import org.springframework.security.GrantedAuthority;
31
import org.springframework.security.core.GrantedAuthority;
32 32

  
33 33
@XmlAccessorType(XmlAccessType.FIELD)
34 34
@XmlType(name = "Group", propOrder = {

Also available in: Unified diff