Pedro Beschorner Marin 0ab207c997 Merge remote-tracking branch 'mconf/mconf'		2017-03-21 19:47:11 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'mconf/mconf'	2017-03-21 19:47:11 +00:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf'	2017-03-21 19:47:11 +00:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00