| docs | 8a898014b8
					Renamed branch from 7.x-1.x to 7.x-2.x. Also merged bug fixes from 6.x-1.x | %!s(int64=12) %!d(string=hai) anos | 
		
			
				
					| tripal_analysis | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_bulk_loader | ccb384e703
					Replaced tabs with two spaces... updated node template | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_contact | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_core | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_cv | 2d134ac564
					Fixed feature autocomplete | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_db | 6bbb3eb45b
					Fixed access arguments for all menu items | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_example | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_feature | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_featuremap | 2c781fd8c4
					Fixed another set of merge conflicts | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_genetic | 50a55700b1
					Changed node_view array element from '#value' to '#markup'. Node template now handles teasers properly as well as CCK elements added to a page | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_library | 2c781fd8c4
					Fixed another set of merge conflicts | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_natural_diversity | 50a55700b1
					Changed node_view array element from '#value' to '#markup'. Node template now handles teasers properly as well as CCK elements added to a page | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_organism | a6c28cca4a
					Added props and dbxref templates for organism | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_phenotype | 50a55700b1
					Changed node_view array element from '#value' to '#markup'. Node template now handles teasers properly as well as CCK elements added to a page | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_project | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_pub | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_stock | 34b866f276
					Fixed merge conflict and changed 'Details' to 'Overview' on node pages | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| tripal_views | ccb384e703
					Replaced tabs with two spaces... updated node template | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| .gitignore | 455df59fcc
					removing empty lines | %!s(int64=14) %!d(string=hai) anos | 
		
			
				
					| LICENSE.txt | f8f44afa9c
					Added orphaned form items to sync form. Library module is now converted. | %!s(int64=11) %!d(string=hai) anos | 
		
			
				
					| README.txt | 8a898014b8
					Renamed branch from 7.x-1.x to 7.x-2.x. Also merged bug fixes from 6.x-1.x | %!s(int64=12) %!d(string=hai) anos |