Skip to content
GitLab
Commit 17aae88d authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '1.0.10' of... 

Merge branch '1.0.10' of ssh://git.fusiondirectory.org/srv/git_repos/main/fusiondirectory into 1.0.10
parents 0d8bb499 d2e71340
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
include/variables_common.inc
+ 1
− 1
View file @ 17aae88d
...@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path ...@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*! /*!
* \brief FusionDirectory Version * \brief FusionDirectory Version
*/ */
define ("FD_VERSION", "1.0.9.2-fixes"); /*! Define FusionDirectory version */ define ("FD_VERSION", "1.0.10-dev"); /*! Define FusionDirectory version */
/*! /*!
* \brief FusionDirectory config object RDN * \brief FusionDirectory config object RDN
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment