rabuzarus d39f679230 Merge develop into 1006-short-info ... Conflicts: view/theme/frio/js/theme.js		2016-06-11 10:52:26 +02:00
..
hovercard.css	frio: some hover card css fixes	2016-06-07 10:13:08 +02:00
style.css	Merge develop into 1006-short-info	2016-06-11 10:52:26 +02:00