• iv's avatar
    gitlab: Merge in upstream config updates · b6022ed7
    iv authored
        This does almost only pure merge. We will slaposify / adjust config
        and corresponding md5sum in the following patches.
    
    Conflicts:
    	software/gitlab/template/gitlab.yml.in
    	software/gitlab/template/nginx.conf.in
    b6022ed7
smtp_settings.rb.in 1.26 KB