Merge branch 'master' into develop

NextDom · May 14, 2018 · dc72e51 · dc72e51
2 parents 08146fa + f2c711b
commit dc72e51
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# plugin-teleinfo ![build](https://travis-ci.org/NextDom/plugin-teleinfo.svg?branch=develop)
+# plugin-teleinfo ![build](https://travis-ci.org/NextDom/plugin-teleinfo.svg?branch=master)
 
 Plugin pour utiliser les modems téléinformation USB sur Jeedom
 

diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
@@ -10,7 +10,15 @@ A venir
 - Refaire fonctionner le mode 2 compteurs.
 - Noms des variables et fonctions
 
-3.0.0 Stable [![Stable](https://img.shields.io/badge/version-stable-brightgreen.svg?longCache=true&style=flat-square)](https://github.com/NextDom/plugin-teleinfo/releases)
+3.0.2 Stable [![Stable](https://img.shields.io/badge/version-stable-brightgreen.svg?longCache=true&style=flat-square)](https://github.com/NextDom/plugin-teleinfo/releases)
+=====
+- Droits sur le port
+
+3.0.1
+=====
+- Correction erreur horodatage
+
+3.0.0
 =====
 - Compatibilité Linky
 - Fonction diagnostique

diff --git a/plugin_info/info.json b/plugin_info/info.json
@@ -15,5 +15,5 @@
 	},
 	"changelog" : "https://NextDom.github.io/plugin-teleinfo/#language#/changelog",
 	"documentation" : "https://NextDom.github.io/plugin-teleinfo/#language#/",
-	"pluginVersion" : "3.1.1"
+	"pluginVersion" : "3.1.0"
 }