Merge branch 'dev' into early

EmuDeck · Dec 21, 2023 · 3a17e1f · 3a17e1f
2 parents 9bc7f14 + 3d69c7a
commit 3a17e1f
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 609 deletions.
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -334,7 +334,7 @@ export default function App() {
           <Route exact path="/check-updates" element={<CheckUpdatePage />} />
           <Route exact path="/patreon-login" element={<PatreonLoginPage />} />
 
-          <Route exact path="/welcome" element={<SettingsPage />} />
+          <Route exact path="/welcome" element={<WelcomePage />} />
           <Route
             exact
             path="/device-selector"

diff --git a/src/renderer/components b/src/renderer/components
+2 −1		organisms/PatreonLogin/PatreonLogin.jsx
+2 −2		organisms/Wrappers/EmuDetail.jsx
+2 −88		organisms/Wrappers/Welcome.jsx