projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
[kivitendo-erp.git]
/
DEBIAN
/
DEBIAN
/
conffiles
diff --git
a/DEBIAN/DEBIAN/conffiles
b/DEBIAN/DEBIAN/conffiles
index
be00446
..
4cb0a3b
100644
(file)
--- a/
DEBIAN/DEBIAN/conffiles
+++ b/
DEBIAN/DEBIAN/conffiles
@@
-1,2
+1,3
@@
-/etc/apache2/conf.d/lx-office-erp.apache2.conf
-/usr/lib/lx-office-erp/config/lx-erp.conf
+/etc/lx-office-erp/lx-office-erp.apache2.conf
+/etc/lx-office-erp/lx-office-erp.cherokee
+/etc/lx-office-erp/lx-office-erp.cherokee.handler