Revision 1328371

Jump to revision:
Author:	mfranklin
Date:	Fri Apr 20 13:34:07 2012 UTC (12 years ago)
Changed paths:	7
Log Message:	merged in from trunk

Changed paths

Path	Details
rave/branches/bootstrap/	modified , props changed
rave/branches/bootstrap/rave-demo-gadgets/src/main/webapp/open_views_demo.xml (Copied from rave/trunk/rave-demo-gadgets/src/main/webapp/open_views_demo.xml, r1328330)	added
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql	modified , text changed
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/script/rave.js	modified , text changed
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/script/rave_opensocial.js	modified , text changed
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/script/rave_wookie.js	modified , text changed
rave/branches/bootstrap/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java	modified , text changed