synced with master

2022-08-31 21:33:17 +03:00
parent f5ff7193a9 4e78f1e4ad
commit f61d0ec6f7
12 changed files with 164 additions and 147 deletions
@@ -4,4 +4,8 @@ PB_PROFILE_COLLECTION = "profiles"
 PB_INSTALLER_PARAM    = "installer"
 PB_RULES_SYNTAX_DOCS  = "https://pocketbase.io/docs/manage-collections#rules-filters-syntax"
 PB_RELEASES           = "https://github.com/pocketbase/pocketbase/releases"
+<<<<<<< HEAD
 PB_VERSION            = "v0.6.0"
+=======
+PB_VERSION            = "v0.5.2"
+>>>>>>> master