Commit 1de7413
committed
Merge branch 'master' into feature/v2
# Conflicts:
# .yarn/releases/yarn-4.8.0.cjs
# .yarnrc.yml
# package.json
# src/components/Layout/index.jsx
# src/contexts/MainContextProvider/index.jsx
# src/pages/donate/index.jsx
# src/pages/software/deadpix/index.jsx
# src/reducers/MainReducer/Actions/actionTypes.js
# src/reducers/MainReducer/Actions/index.js
# src/reducers/MainReducer/index.jsx
# yarn.lock0 file changed
0 commit comments