Merge branch 'dev' of https://github.com/xdrm-brackets/SID into dev

phpExecel ajout-> import_notes
2015-11-20 17:30:50 +01:00 · 2015-11-20 17:30:50 +01:00 · 5b9203df94
parent c855d0c1b6 b744270032
commit 5b9203df94
2 changed files with 1 additions and 2 deletions
--- a/src/excelTemplates/.~lock.mcc.xlsx#
+++ b/src/excelTemplates/.~lock.mcc.xlsx#
@ -1 +0,0 @@
-,xdrm,linux,20.11.2015 16:35,file:///home/xdrm/.config/libreoffice/4;
--- a/xdoc/empty.sql
+++ b/xdoc/empty.sql
@ -1,4 +1,4 @@
-- phpMyAdmin SQL Dump
+-- phpMyAdmin SQL Dump 
 -- version 4.0.10deb1
 -- http://www.phpmyadmin.net
 --
				`@ -1 +0,0 @@`
				`,xdrm,linux,20.11.2015 16:35,file:///home/xdrm/.config/libreoffice/4;`