]> git.ipfire.org Git - thirdparty/AWStats.git/commit
projects / thirdparty / AWStats.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac8957c ba1b805)
Merge branch 'develop' of https://github.com/brentil/awstats into
authorLaurent Destailleur <eldy@destailleur.fr>
Thu, 16 Apr 2020 08:52:15 +0000 (10:52 +0200)
committerLaurent Destailleur <eldy@destailleur.fr>
Thu, 16 Apr 2020 08:52:15 +0000 (10:52 +0200)
commitc7451e131063321227348f0ea9953413fcdb0b42
treee1aed000f238a58eeb79a54ce03135a27123ebdftree | snapshot
parentac8957c40cdb98d0f5b102f1f7c03a92673f2333commit | diff
parentba1b80599a02a5c9741e4b2112cee9bf801f8190commit | diff
Merge branch 'develop' of https://github.com/brentil/awstats into
brentil-develop

# Conflicts:
# wwwroot/cgi-bin/lib/operating_systems.pm
# wwwroot/icon/os/macosx13.png
wwwroot/cgi-bin/lib/operating_systems.pm diff1 | diff2 | blob | history
Mirror of https://github.com/eldy/AWStats.git