Merge remote-tracking branch 'origin/master'

[jirafeau.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index 537485e08fa1de98a3773a29800f67a8696f5e68..c38e640efc8675a7a653113e5aae543e73d4a234 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -58,7 +58,8 @@ $cfg['upload_password'] = array();
  */
 $cfg['upload_ip'] = array();
 /* An empty admin password will disable the classic admin password
  */
 $cfg['upload_ip'] = array();
 /* An empty admin password will disable the classic admin password

- * authentication.
+ * authentication. Note that admin password is a sha256 hash of the original
+ * version.

  */
 $cfg['admin_password'] = '';
 /* If set, let's the user to be authenticated as administrator.
  */
 $cfg['admin_password'] = '';
 /* If set, let's the user to be authenticated as administrator.