diff .svn/pristine/11/114bca33e13814e69bb30791d00e3851d89cb11c.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:10:11 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/11/114bca33e13814e69bb30791d00e3851d89cb11c.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,14 @@
+documents_001: 
+  created_on: 2007-01-27 15:08:27 +01:00
+  project_id: 1
+  title: "Test document"
+  id: 1
+  description: "Document description"
+  category_id: 1
+documents_002: 
+  created_on: 2007-02-12 15:08:27 +01:00
+  project_id: 1
+  title: "An other document"
+  id: 2
+  description: ""
+  category_id: 1
\ No newline at end of file