Domovoy 66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: update.php		2012-08-03 18:57:37 +02:00
..
cleanzero
comix
comix-plain
darkbubble	add a placeholder attribute on search-text; dispy fixes	2012-05-23 15:58:22 -04:00
darkzero	Darkzero/NS .contact-photo-menu	2012-08-03 03:07:29 +01:00
darkzero-NS	Darkzero/NS .contact-photo-menu	2012-08-03 03:07:29 +01:00
diabook	bbcode: two new bbcode elements (style, class) for CSS	2012-08-02 00:13:37 +02:00
dispy	update head.tpl for dispy	2012-07-24 18:29:23 -06:00
duepuntozero	Collapsing is back for threaded comments.	2012-07-29 17:13:21 +02:00
easterbunny
facepark	Various theme stuff.	2012-07-02 03:40:12 +01:00
frost	ugly fix to make editplain work	2012-08-01 19:09:28 -06:00
frost-mobile	ugly fix to make editplain work	2012-08-01 19:09:28 -06:00
greenzero
purplezero
quattro	quattro: readd sparkle cursor	2012-08-01 04:45:27 -04:00
slack-NS
slackr	a bit more colour	2012-07-05 22:20:27 -07:00
testbubble	Add sparkle cursor to Quattro/Vier/TestBubble	2012-07-12 19:21:21 +01:00
vier	Add sparkle cursor to Quattro/Vier/TestBubble	2012-07-12 19:21:21 +01:00