Michael cafd400352 Merge remote branch 'upstream/master' ... Conflicts: view/theme/vier/style.css		2012-02-19 20:09:42 +01:00
..
colors.less	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
contact_template.tpl	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
icons.less	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
icons.png	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
icons.svg	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
quattro.less	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
search_item.tpl	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
style.css	Merge remote branch 'upstream/master'	2012-02-19 20:09:42 +01:00
style.less	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
wall_item.tpl	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
wallwall_item.tpl	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00