Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master' ... Conflicts: mod/crepair.php		2014-01-05 16:22:42 +01:00
..
cleanzero
comix
comix-plain
darkbubble
darkzero
darkzero-NS
decaf-mobile
diabook
dispy
duepuntozero	user contacts: fix #797 , add searching in url and nickname, add batch actions	2013-12-17 05:19:06 -05:00
easterbunny
facepark
frost
frost-mobile
greenzero
purplezero
quattro	change action container div class to id. fix bug in quattro theme	2013-12-18 06:38:57 -05:00
slack-NS
slackr
smoothly
testbubble
vier	Merge remote-tracking branch 'upstream/master'	2014-01-05 16:22:42 +01:00