Mercurial > hg > soundsoftware-site
comparison test/fixtures/.svn/text-base/wiki_contents.yml.svn-base @ 524:1248a47e81b3 feature_36
Merge from branch "luisf"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 14:39:38 +0100 |
parents | 8661b858af72 |
children |
comparison
equal
deleted
inserted
replaced
519:3be6bc3c2a17 | 524:1248a47e81b3 |
---|---|
93 page_id: 9 | 93 page_id: 9 |
94 id: 9 | 94 id: 9 |
95 version: 1 | 95 version: 1 |
96 author_id: 1 | 96 author_id: 1 |
97 comments: | 97 comments: |
98 wiki_contents_010: | |
99 text: Page with cyrillic title | |
100 updated_on: 2007-03-08 00:18:07 +01:00 | |
101 page_id: 10 | |
102 id: 10 | |
103 version: 1 | |
104 author_id: 1 | |
105 comments: | |
98 | 106 |