Merge branch 'master' into rorcz
commit7c6af80ccb9ce356e25c121f63167a8cba129279
authorKyle J. McKay <mackyle@gmail.com>
Thu, 12 Nov 2020 01:07:04 +0000 (11 18:07 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 12 Nov 2020 01:07:04 +0000 (11 18:07 -0700)
tree991b8205828d079d40d3aae56526f7ec96b6a5ea
parent898fd9b9977d96c463910ecdee56889b7cc3b2c5
parent586fe818b037ae8784ebdafa8b5395ffba371d35
Merge branch 'master' into rorcz
Girocco/Config.pm
apache.conf.in
jobd/update.sh