Merge remote-tracking branch 'origin/master'

2019-07-16 18:55:41 +02:00 · 2019-07-16 18:55:41 +02:00 · 5cc4d84cd0
commit 5cc4d84cd0
parent da423cfb7c be5e7d1be5
4 changed files with 1 additions and 0 deletions
--- a/.~lock.pedalier
+++ b/.~lock.pedalier
@ -0,0 +1 @@
+,LABOUEST-PORT01/Lab Ouest,,12.07.2019 22:26,file:///C:/Users/Lab%20Ouest/AppData/Roaming/LibreOffice/4;
--- a/banc03.JPG
+++ b/banc03.JPG
--- a/exemple.JPG
+++ b/exemple.JPG
--- a/BDO.odt
+++ b/BDO.odt
				`@ -0,0 +1 @@`
				`,LABOUEST-PORT01/Lab Ouest,,12.07.2019 22:26,file:///C:/Users/Lab%20Ouest/AppData/Roaming/LibreOffice/4;`