solocla/zibo-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/user_profile

Browse Source 
# Conflicts:
#	public/userarea/include/navbar.php
This commit is contained in:
r.mubarakzyanov
2026-05-17 20:06:15 +03:00
parent d155d1cbab e6a805f1f7
commit ece1beb87f
10984 changed files with 1366 additions and 1350770 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/userarea/include/headscript.php
+1 -1
View File
@@ -59,5 +59,5 @@ $photousername = basename($avatar);
require_once(__DIR__ . '/../../languages/en/general.php');
//include("generalsettings.php");
require_once __DIR__ . '/permissions_helper.php';
?>