Commit 5a75386d97f616c3944d04b5e4a33006f2761436

Authored by Rodrigo Gonçalves
2 parents c02a227b 7c19ff26
Exists in master

Merge branch 'otrs-4.0.4' of gitlab.setic.ufsc.br:rodrigo.g/otrs-queues-panel into otrs-4.0.4

Conflicts:
	Kernel/Modules/QueuesPanel.pm
	QueuesPanel.sopm
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
QueuesPanel.sopm
... ... @@ -36,4 +36,4 @@
36 36 <File Permission="644" Location="var/httpd/htdocs/skins/Customer/default/images/hColumns/glyphicons-halflings.png"></File>
37 37  
38 38 </Filelist>
39   -</otrs_package>
40 39 \ No newline at end of file
  40 +</otrs_package>
... ...