Felipe Cecagno 83ae244485 Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3		2015-10-19 11:49:36 -02:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3	2015-10-19 11:49:36 -02:00
config.xml.template	Merge branch 'mconf-live0.6.4' into base-for-0.6.4	2015-06-22 17:18:26 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00