Jon Corson-Rikert ea93eea861 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 ... Conflicts: rdf/tbox/firsttime/initialTBoxAnnotations.n3		2013-12-06 13:47:09 -05:00
..
abox	Update continents.n3	2013-11-26 10:05:16 -07:00
applicationMetadata/firsttime	VIVO-262 Add languages to VIVO at build time.	2013-09-09 12:23:36 -04:00
display	Minor changes to hide additional eagle-i properties that are deprecated or involve classes not currently in VIVO	2013-12-06 13:23:57 -05:00
tbox	Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6	2013-12-06 13:47:09 -05:00