Merge branch 'master' into dev

cortex-lab · Oct 18, 2023 · 0a28308 · 0a28308
2 parents 1903851 + cceaf6b
commit 0a28308
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/alyx/actions/fixtures/actions.proceduretype.json b/alyx/actions/fixtures/actions.proceduretype.json
@@ -14,7 +14,7 @@
  "fields": {
   "name": "Water restriction",
   "json": null,
-  "description": "- Variation in the compositigit con, constituents, quantity and/or availability of the diet and/or drinking water which may cause pain, suffering, distress or lasting harm - withholding of water"
+  "description": "- Variation in the composition, constituents, quantity and/or availability of the diet and/or drinking water which may cause pain, suffering, distress or lasting harm - withholding of water"
  }
 },
 {

diff --git a/alyx/alyx/__init__.py b/alyx/alyx/__init__.py
@@ -1 +1 @@
-VERSION = __version__ = '1.16.2'
+VERSION = __version__ = '1.16.1'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VERSION = __version__ = '1.16.2'
		VERSION = __version__ = '1.16.1'