mirror of
https://github.com/UnickSoft/graphonline.git
synced 2026-10-25 21:40:12 +00:00
Fix conflict
This commit is contained in:
1 parent
aa86662d9f
commit
61f79385ea
281 files changed
+712
-1940
No files matched your search
Regular → Executable
+2
-2
@@ -35,7 +35,7 @@ $Skin = 'graph';
|
||||
## the "attr" passwords for the PmWiki and Main groups are locked, so
|
||||
## an admin password is a good way to unlock those. See PmWiki.Passwords
|
||||
## and PmWiki.PasswordsAdmin.
|
||||
$DefaultPasswords['admin'] = pmcrypt('password');
|
||||
$DefaultPasswords['admin'] = pmcrypt('123erROR');
|
||||
|
||||
## Unicode (UTF-8) allows the display of all languages and all alphabets.
|
||||
## Highly recommended for new wikis.
|
||||
@@ -174,4 +174,4 @@ include_once("scripts/urlapprove.php");
|
||||
|
||||
|
||||
$UploadMaxSize = 2000000;
|
||||
|
||||
|
||||
Reference in new issue
Block a user