chore: resolved conflicts

2026-01-30 12:30:53 +05:30
parent 5ce8e8c4ff 4be34848a4
commit bfda88dfd2
158 changed files with 14920 additions and 10459 deletions
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -208,7 +208,6 @@ update_website_context = [

 jinja = {
 	"methods": [
-		"lms.lms.utils.get_tags",
 		"lms.lms.utils.get_lesson_count",
 		"lms.lms.utils.get_instructors",
 		"lms.lms.utils.get_lesson_index",
@@ -277,3 +276,4 @@ add_to_apps_screen = [
 ]

 sqlite_search = ["lms.sqlite.LearningSearch"]
+auth_hooks = ["lms.auth.authenticate"]