Fabien Meghazi b7003a382a [MERGE] upstream ... bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea		2014-04-29 17:41:04 +02:00
..
css	[MERGE] from trunk	2014-04-23 17:48:52 +02:00
img	[IMP] replaced calendar icon with map and cloud, top and bottom margin added, domain added for confirmed events, used font-awesome instead of block-country_event.png	2014-03-04 12:31:04 +05:30
js	[MERGE] upstream	2014-04-29 17:41:04 +02:00
xml	[MERGE] from trunk	2014-04-08 15:24:12 +02:00