Yogesh Choudhary Paliyal 8496ab825a Merge branch 'feature/ktlint' of https://github.com/yogeshpaliyal/KeyPass ...

 Conflicts:

	app/build.gradle

	app/src/main/java/com/yogeshpaliyal/keypass/AppDatabase.kt

	app/src/main/java/com/yogeshpaliyal/keypass/data/AccountModel.kt

	app/src/main/java/com/yogeshpaliyal/keypass/db/DbDao.kt

	app/src/main/java/com/yogeshpaliyal/keypass/db_helper/DbBackupRestore.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/auth/AuthenticationActivity.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/detail/DetailActivity.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/generate/GeneratePasswordActivity.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeFragment.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/home/HomeViewModel.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/BottomNavDrawerFragment.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/nav/DashboardActivity.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt

	app/src/main/java/com/yogeshpaliyal/keypass/ui/settings_activity/SettingsActivity.kt

	app/src/main/java/com/yogeshpaliyal/keypass/utils/BackupUtils.kt

	app/src/main/java/com/yogeshpaliyal/keypass/utils/IntentHelper.kt

	app/src/main/java/com/yogeshpaliyal/keypass/utils/SharedPreferenceUtils.kt

2021-08-15 20:02:17 +05:30

..

production/release

Merge branch 'feature/ktlint' of https://github.com/yogeshpaliyal/KeyPass

2021-08-15 20:02:17 +05:30

release

initial commit

2021-01-31 22:06:02 +05:30

src

Merge branch 'feature/ktlint' of https://github.com/yogeshpaliyal/KeyPass

2021-08-15 20:02:17 +05:30

.gitignore

initial commit

2021-01-31 22:06:02 +05:30

.localazy

added multiple language support

2021-07-04 12:26:46 +05:30

build.gradle

Merge branch 'feature/ktlint' of https://github.com/yogeshpaliyal/KeyPass

2021-08-15 20:02:17 +05:30

proguard-rules.pro

initial commit

2021-01-31 22:06:02 +05:30