Stephen Ficklin 6191f447f8 Fixed merge conflict %!s(int64=9) %!d(string=hai) anos
..
api 6191f447f8 Fixed merge conflict %!s(int64=9) %!d(string=hai) anos
includes 6191f447f8 Fixed merge conflict %!s(int64=9) %!d(string=hai) anos
theme 18351daec1 Reorganizging to separate Chado content into new tripal_chado module and created new TripalVocab and TripalTerm entities %!s(int64=9) %!d(string=hai) anos
tripal_entities.info 18351daec1 Reorganizging to separate Chado content into new tripal_chado module and created new TripalVocab and TripalTerm entities %!s(int64=9) %!d(string=hai) anos
tripal_entities.install 6191f447f8 Fixed merge conflict %!s(int64=9) %!d(string=hai) anos
tripal_entities.module facf5d663e TripalTerm & TripalVocab entities are now working. %!s(int64=9) %!d(string=hai) anos
tripal_entities.views_default.inc cc77f29700 Entity content finder and structure changer are working %!s(int64=9) %!d(string=hai) anos