75d5724c8a
Conflicts: frontend/delta/css/clipperz.css frontend/delta/js/Clipperz/PM/DataModel/Record.js frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js frontend/delta/js/Clipperz/PM/UI/MainController.js frontend/delta/properties/delta.properties.json frontend/delta/scss/style/settingsPanel.scss |
||
---|---|---|
.. | ||
DevicePreferences.js | ||
DirectLogin.js | ||
DirectLoginBinding.js | ||
DirectLoginFormValue.js | ||
DirectLoginInput.js | ||
EncryptedRemoteObject.js | ||
Feature.js | ||
OneTimePassword.js | ||
Record.js | ||
Record.Version.Field.js | ||
Record.Version.js | ||
User.AccountInfo.js | ||
User.Header.Legacy.js | ||
User.Header.OneTimePasswords.js | ||
User.Header.Preferences.js | ||
User.Header.RecordIndex.js | ||
User.js |