Merge remote-tracking branch 'origin/master' into bugfix/261

* origin/master:
  Uncommented the mysql server start for the build.
  Preapred the release 2.9.12

.github/workflows/php.yml

@@ -28,8 +28,8 @@ jobs:
         #mysql user: $MYSQL_USER # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too
         #mysql password: $MYSQL_PASSWORD # Required if "mysql user" exists. The password for the "mysql user"
 
-    #- name: Start MySQL (SUDO)
-      #run: sudo service mysql start
+    - name: Start MySQL (SUDO)
+      run: sudo service mysql start
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v1

CHANGELOG.md

@@ -1,6 +1,26 @@
 MONARC Changelog
 ================
 
+## 2.9.12 (2020-03-20)
+
+### New
+
+- batch import of information risks from csv/xlsx file
+  ([#246](https://github.com/monarc-project/MonarcAppFO/issues/246)).
+
+### Enhancement
+
+- use a better encryption method for the export of objects and analysis
+  ([#260](https://github.com/monarc-project/MonarcAppFO/issues/260)).
+
+### Fix
+
+- Remove comment field of threat in export object of library 
+  ([#245](https://github.com/monarc-project/MonarcAppFO/issues/245)).
+- Edition and creation of operational risk linked a tag in use on risk analysis 
+  ([#262](https://github.com/monarc-project/MonarcAppFO/issues/262)). 
+
+
 ## 2.9.11 (2020-02-21)
 
 ### New

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":9, "hotfix":11}
+{"major":2, "minor":9, "hotfix":12}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.9.11",
+  "version": "2.9.12",
   "description": "Monarc front office application",
   "private": true,
   "repository": {