rjy7 4bfeadf3ad Merging r5332 r5336:5338 r5341 r5349 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint		2010-07-20 23:24:01 +00:00
..
ajax	NIHVIVO-649 Add freemarker template flattening to build. Includes flattening of template directory structure in vivo theme, and renaming of templates as needed for clarity.	2010-07-08 17:10:31 +00:00
body	Merging r5332 r5336:5338 r5341 r5349 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint	2010-07-20 23:24:01 +00:00
lib	NIHVIVO-649 Add freemarker template flattening to build. Includes flattening of template directory structure in vivo theme, and renaming of templates as needed for clarity.	2010-07-08 17:10:31 +00:00
page	fixed a couple typos in the comments at the bottom of this page	2010-07-15 16:29:49 +00:00