🔀 Rebased from master

.github/AUTHORS.txt

@@ -1,3 +1,4 @@
+0n1cOn3 <0n1cOn3@gmx.ch> - 1 commits
 Alicia <liss-bot@d0h.co> - 1 commits
 Begin <support@begin.com> - 1 commits
 David <skaarj1989@gmail.com> - 1 commits
@@ -12,11 +13,13 @@ Rune <jørnerå> - 1 commits
 Ryan <urne> - 1 commits
 Shreya <o> - 1 commits
 Singebob <jeremy.chauvin@systeme-u.fr> - 1 commits
+Steven <as> - 1 commits
 Xert <xertdev@gmail.com> - 1 commits
 deepsource-io[bot] <deepsource-io[bot]@users.noreply.github.com> - 1 commits
 icy-comet <50461557+icy-comet@users.noreply.github.com> - 1 commits
 jnach <33467747+jnach@users.noreply.github.com> - 1 commits
 tazboyz16 <tazboyz_16@yahoo.com> - 1 commits
+Alessandro <e> - 2 commits
 BOZG <sr@bozg.se> - 2 commits
 Brendan <&#39;Lear> - 2 commits
 Dan <ilber> - 2 commits
@@ -24,6 +27,7 @@ Ruben <ilv> - 2 commits
 liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits
 ᗪєνιη <υн> - 2 commits
 Walkx <71191962+walkxcode@users.noreply.github.com> - 3 commits
+aterox <kenneth@kenneth.church> - 3 commits
 Niklas <abe> - 4 commits
 Alicie <gh@d0h.co> - 5 commits
 UrekD <urek.denis@gmail.com> - 5 commits
@@ -37,12 +41,12 @@ snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
 aterox <church.kennetha@gmail.com> - 19 commits
 EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
 Alicia <yke> - 28 commits
-repo-visualizer <repo-visualizer@users.noreply.github.com> - 28 commits
-snyk-bot <snyk-bot@snyk.io> - 35 commits
-Alicia <o> - 55 commits
-liss-bot <liss-bot@d0h.co> - 71 commits
-Alicia <yke> - 75 commits
+repo-visualizer <repo-visualizer@users.noreply.github.com> - 30 commits
+snyk-bot <snyk-bot@snyk.io> - 37 commits
+Alicia <o> - 61 commits
+liss-bot <liss-bot@d0h.co> - 75 commits
 Lissy93 <gh@d0h.co> - 78 commits
+Alicia <yke> - 87 commits
 Lissy93 <Lissy93@users.noreply.github.com> - 206 commits
 Alicia <yke> - 334 commits
-Alicia <yke> - 1430 commits
+Alicia <yke> - 1439 commits

.github/CHANGELOG.md

@@ -13,6 +13,18 @@
 - Adds typecheck on edit item tags, Re: #575
 - Fixes item size in config not honored, Re: #576
 
+## ✨ 2.0.5 - Bug Fixes and a few New Features
+
+#### Partially revert 2.0.4, fixing several issues caused by `conf.yml` not being loaded at startup.
+This change requires a rebuild of the application when several options under `appConfig` are changed.
+Fixes #544 #555
+
+#### Several other changes since 2.0.4, including:
+The `Add New Section` button on the UI editor now displays if no sections are present. #536
+When using SSL, the server can now redirect from HTTP to HTTPS. This is enabled by default when using SSL. #538
+Section context menus are now accessible on mobile, and will no longer clip off the screen. #541
+Italian translations have been added. #556
+
 ## ✨ 2.0.4 - Dynamic Config Loading [PR #528](https://github.com/Lissy93/dashy/pull/528)
 - `conf.yml` is now loaded dynamically and the app now only needs a browser refresh on config change, not a full rebuild!
 

.github/LATEST_CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 🐛 Fixes user requested issues [PR #557](https://github.com/Lissy93/dashy/pull/557)
 - Allows middle click open new tab, Re: #492
 - Implements Max redirects for status checks, Re: #494
@@ -10,3 +11,14 @@
 - Fixes local image path on sub-page, Re: #570
 - Adds typecheck on edit item tags, Re: #575
 - Fixes item size in config not honored, Re: #576
+=======
+### Partially revert 2.0.4, fixing several issues caused by `conf.yml` not being loaded at startup.
+This change requires a rebuild of the application when several options under `appConfig` are changed.
+Fixes #544 #555
+
+### Several other changes since 2.0.4, including:
+The `Add New Section` button on the UI editor now displays if no sections are present. #536
+When using SSL, the server can now redirect from HTTP to HTTPS. This is enabled by default when using SSL. #538
+Section context menus are now accessible on mobile, and will no longer clip off the screen. #541
+Italian translations have been added. #556
+>>>>>>> b51935f04976a56a27ecd3cd3124766f7148bfd0