Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-10-09 21:50:32 +02:00
parent 28eecf6a09
commit 10a83bc6c4
37 changed files with 1178 additions and 1848 deletions

View File

@@ -1,4 +1,4 @@
{
"directory" : "tmp-assets",
"directory": "www/assets",
"interactive": false
}