Merge branch 'master' into 'testing'

Merge branch 'master' into testing See merge request !2735

Merge branch 'master' into 'testing'
Merge branch 'master' into testing See merge request !2735
ac5efcc9 · Jean Visagie · 48c08fb4 · b23f43da · ac5efcc9
Commit ac5efcc9 authored 2 years ago by Jean Visagie
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 4 deletions
+0 -4
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,3 @@ install-data-local: tx-install
 lighttpdconfigdir = /etc/lighttpd.d
 dist_lighttpdconfig_DATA = $(top_srcdir)/httpd/lighttpd/dss.conf

-wwwdir = /www/pages/test
-nodist_www_DATA = \
-	$(top_srcdir)/www/index.html \
-	$(top_srcdir)/www/index.js