Skip to content
  • Stephan Müller's avatar
    Merge branch 'NETZkultur/master' into 'master': · 48564f57
    Stephan Müller authored
    commit 16e5574c
    Author: Sven Mulholland <mulholland@netzkultur.de>
    Date:   Wed Jan 6 16:04:17 2021 +0100
    
        removed the otpKey from the secret-inwx-credentials.yaml.tpl
    
    commit cc7732b7
    Author: Sven Mulholland <mulholland@netzkultur.de>
    Date:   Mon Jan 4 08:52:28 2021 +0100
    
        added empty quotations "" here to be a valid yaml
    
    commit ff7f12ae
    Author: Sven Mulholland <mulholland@netzkultur.de>
    Date:   Sat Jan 2 16:13:06 2021 +0100
    
        extracted the tryToUnlockWithOTPKey method to get rid of the duplication for the tan generation
    
    commit 70c3b882
    Merge: 9022604d 0127ae72
    Author: Sven Mulholland <mulholland@netzkultur.de>
    Date:   Wed Dec 30 20:53:30 2020 +0100
    
        Merge remote-tracking branch 'origin/master'
    
        # Conflicts:
        #	testdata/config.json.tpl
    
    commit 9022604d
    Merge: 62b339ae 3bdc199b
    Auth...
    48564f57