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
..
calc_reducer.dart	Calculator	2020-06-22 20:10:48 +06:00
main_reducer.dart	Calculator	2020-06-22 20:10:48 +06:00
setting_reducer.dart	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
user_reducer.dart	release 1.0.2	2020-06-25 13:48:18 +06:00