chore: bump version, update CHANGELOG

pluginsGLPI · Oct 10, 2017 · 12077e9 · 12077e9
1 parent 280a215
commit 12077e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 GLPI Formcreator ChangeLog
 ===============================
 
+Version 2.6.0
+-------------
+## Bugfixes
+* fix CSS preventing access to entity selection in service catalog (simplified interface)
+* fix error if plugin Tag not available but used in a form to display
+* various JS fixes
+
 Version 2.6.0 Release Candidate 1
 ---------------------------------
 

diff --git a/plugin.xml b/plugin.xml
@@ -175,6 +175,10 @@ Features
          <num>2.6.0-rc1</num>
          <compatibility>9.2.0</compatibility>
       </version>
+      <version>
+         <num>2.6.0</num>
+         <compatibility>9.2.0</compatibility>
+      </version>
    </versions>
    <langs>
       <lang>ca_ES</lang>

diff --git a/setup.php b/setup.php
@@ -1,7 +1,7 @@
 <?php
 global $CFG_GLPI;
 // Version of the plugin
-define('PLUGIN_FORMCREATOR_VERSION', '2.6.0-rc1');
+define('PLUGIN_FORMCREATOR_VERSION', '2.6.0');
 // Schema version of this version
 define('PLUGIN_FORMCREATOR_SCHEMA_VERSION', '2.6');