Merge from dev

This commit is contained in:
Florian Henry 2013-11-13 21:34:02 +01:00
parent a8e31ad956
commit fe0006c71d

View File

@ -609,9 +609,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
if (! empty($conf->skype->enabled)) if (! empty($conf->skype->enabled))
{ {
$colspan++; $colspan++;