Felipe Cecagno e44e65dc70 Merge branch '090-branding-logo' into HEAD		2015-01-23 15:42:06 -02:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch '090-branding-logo' into HEAD	2015-01-23 15:42:06 -02:00
config.xml.template	Merge branch '090-branding-logo' into HEAD	2015-01-23 15:42:06 -02:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00