Merge branch 'master' into tarkov

shiptest-ss13 · Nov 21, 2023 · f2de7f2 · f2de7f2
2 parents 31ec5e0 + c5ca724
commit f2de7f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-2504.yml b/html/changelogs/AutoChangeLog-pr-2504.yml
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
@@ -133,3 +133,6 @@
   - bugfix: Various laser weapons that had broken autofire (E-TAR and the Tesla Cannon)
       now work
   - spellcheck: Grammar on some descriptions was corrected.
+2023-11-20:
+  thgvr:
+  - imageadd: Restored space parallax to its former whimsical glory.