2 commits

Author	SHA1	Message	Date
Tim Worrall	488f7ce265	there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name	2014-06-20 13:11:50 -04:00
j2blake	2e69f0379b	NIHVIVO-3772 NIHVIVO-3721 Incorporate the OpenSocial integration from Eric Meeks at CTSI, UCSF. Add instructions on how to install and configure ORNG Shindig.	2012-06-05 19:31:08 +00:00