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
..
core	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
redux	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
shared	hide dialog, autoSizeFont,	2020-06-30 20:12:04 +06:00
test	#1790 - Камера EAN-Datamatrix для JS1	2021-01-15 11:11:44 +06:00
views	Merge branch 'master' into pin_locker	2021-03-30 09:42:37 +06:00
widgets	fix deprecate methods	2021-01-18 12:47:59 +06:00
main.dart	print images	2021-03-11 15:48:58 +06:00