From: Gabriel Dunne Date: Sun, 9 Sep 2012 06:13:10 +0000 (-0700) Subject: merging X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=refs%2Fheads%2Fmerging;p=plog.git merging --- diff --git a/data/content/data.json b/data/content/data.json index 35c5369..ac1838d 100644 --- a/data/content/data.json +++ b/data/content/data.json @@ -1 +1 @@ -{"entries":[{"config":{"title":"naag","date":"2012"},"title":"naag","filename":"naag","path":"\/Users\/gdunne\/_portfolio\/www\/content\/projects\/naag","fileInfo":{},"timestamp":"1346728320","tags":null,"content":"

\/cat->name?>\/naag\/projection.jpg\"><\/p>\n\n