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

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
Rodrigo Gonçalves
2 parents c02a227b 7c19ff26
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
.includepath
QueuesPanel.sopm
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includepath>
+  <includepathentry path="/opt/otrs/" />
+</includepath>
+
@@ -36,4 +36,4 @@
         <File Permission="644" Location="var/httpd/htdocs/skins/Customer/default/images/hColumns/glyphicons-halflings.png"></File>
  
     </Filelist>
-</otrs_package>
 \ No newline at end of file
+</otrs_package>
...	...	@@ -0,0 +1,5 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<includepath>
	3	+ <includepathentry path="/opt/otrs/" />
	4	+</includepath>
	5	+
...	...
...	...	@@ -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>
...	...