Fix conflict

2026-02-16 02:30:51 +00:00 · 2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions
--- a/cgi-bin/.htaccess
+++ b/cgi-bin/.htaccess
@@ -1,2 +1,2 @@
 Options +ExecCGI
-AddHandler cgi-script .pl .exe
+AddHandler cgi-script .pl .exe .py
--- a/cgi-bin/CleanImages.php
+++ b/cgi-bin/CleanImages.php
--- a/cgi-bin/GraphOffline/OSX/GraphCGI.exe
+++ b/cgi-bin/GraphOffline/OSX/GraphCGI.exe
--- a/cgi-bin/GraphOffline/Windows/GraphCGI.exe
+++ b/cgi-bin/GraphOffline/Windows/GraphCGI.exe
--- a/cgi-bin/addDonate.php
+++ b/cgi-bin/addDonate.php
--- a/cgi-bin/saveImage.php
+++ b/cgi-bin/saveImage.php
--- a/cgi-bin/sendEmail.php
+++ b/cgi-bin/sendEmail.php
--- a/cgi-bin/vote.php
+++ b/cgi-bin/vote.php