Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-03-30 21:17:46 +02:00
parent e97ed2b3f1
commit 1054483ae9
5 changed files with 10 additions and 5 deletions

1
composer.lock generated
View File

@@ -1426,7 +1426,6 @@
"export",
"import"
],
"time": "2013-11-22 19:10:34"
"time": "2014-01-12 16:34:06"
},
{