]> git.ipfire.org Git - thirdparty/AWStats.git/commit
Fix merge conflicts
authorEdita Kizinevic <edita.kizinevic@cern.ch>
Tue, 24 Nov 2020 19:37:53 +0000 (20:37 +0100)
committerEdita Kizinevic <edita.kizinevic@cern.ch>
Tue, 24 Nov 2020 19:37:53 +0000 (20:37 +0100)
commit3599221d2829e148a229a8a97a92e8f37c7707d6
tree920f8d6adc7bfc9e6fb0183dbc002432ce2bf2d5
parentf3920bba11e7207d90fccef9258befc932fc37d7
parentd342607b2dea6159560558ceef293958504981b4
Fix merge conflicts
wwwroot/cgi-bin/awstats.model.conf
wwwroot/cgi-bin/awstats.pl
wwwroot/cgi-bin/lang/awstats-en.txt