Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php		2012-04-05 13:39:15 +02:00
..
calendar.png	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
colors.less	"vier": The contacts are now working again. Line break before closing bbcodes removed.	2012-02-25 11:00:35 +01:00
contact_template.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
icons.less	"vier": The contacts are now working again. Line break before closing bbcodes removed.	2012-02-25 11:00:35 +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
nav.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
quattro.less	"vier": The contacts are now working again. Line break before closing bbcodes removed.	2012-02-25 11:00:35 +01:00
screenshot.jpg	screenshot gallery	2012-03-25 20:08:28 -07:00
search_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
style.css	Mail: New options for actions after importing mails.	2012-02-26 23:39:29 +01:00
style.less	New theme "vier" derives from "quattro"	2012-02-19 20:05:51 +01:00
wall_item.tpl	templates: fix tags	2012-03-02 12:41:34 +01:00
wallwall_item.tpl	templates: fix tags	2012-03-02 12:41:34 +01:00