suvaissov 0cfbd11ade Merge branch 'master' into pin_locker ... # Conflicts: # lib/core/router.dart # lib/redux/actions/setting_actions.dart # lib/redux/reducers/setting_reducer.dart # lib/redux/state/setting_state.dart # lib/views/home/components/popup_menu.dart # lib/views/home/home_view.dart # pubspec.lock # pubspec.yaml		2021-03-30 09:42:37 +06:00
..
check	printer release	2021-03-17 11:46:30 +06:00
history	printer release	2021-03-17 11:46:30 +06:00
home	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
info_kkm	linter small fixes	2020-07-08 12:42:12 +06:00
lockscreen	pin release	2021-01-19 01:01:58 +06:00
login	ui busy button fix	2020-07-14 16:35:13 +06:00
payment	printer release	2021-03-17 11:46:30 +06:00
qr_view	printer release	2021-03-17 11:46:30 +06:00
settings	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
start_up	barcode-scanner	2020-09-09 16:18:18 +06:00