Merge branch 'master' into v1

piccolo-orm · Sep 28, 2023 · ccbeabf · ccbeabf
2 parents 6906469 + 6031dbb
commit ccbeabf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .mypy_cache/
 .vscode/
+.idea/
 *.pyc
 build/
 dist/

diff --git a/docs/source/crud/piccolo_crud.rst b/docs/source/crud/piccolo_crud.rst
@@ -261,7 +261,7 @@ For example, to return results 11 to 20:
 
 .. code-block::
 
-    GET /movie/?__page=2&page_size=10
+    GET /movie/?__page=2&__page_size=10
 
 -------------------------------------------------------------------------------