4 commits

Author	SHA1	Message	Date
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
friendica	7ef1ed2d70	theme screenshots	2012-03-25 17:55:43 -07:00
friendica	808180ce5f	missing tooltip for "file as"	2012-03-22 04:07:37 -07:00
friendica	89028f2e2f	add comix-plain	2012-03-21 13:55:37 -07:00