diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
| commit | a30350ac6e76c66d14f6d78ed2b5ae4e5799c79c (patch) | |
| tree | a2b7127366a1b9d8d5be9fcda5abefacef7d2579 /releng/fixtures/filesystems.json | |
| parent | d8f82d9d72eec6042536797f75e06a9296f4cc71 (diff) | |
| parent | 2470c543d60c96343a5b0fefe04464b5b445b859 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
devel/views.py
feeds.py
templates/devel/index.html
templates/packages/flag.html
templates/public/index.html
todolists/views.py
urls.py
Diffstat (limited to 'releng/fixtures/filesystems.json')
| -rw-r--r-- | releng/fixtures/filesystems.json | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/releng/fixtures/filesystems.json b/releng/fixtures/filesystems.json new file mode 100644 index 00000000..208f5c73 --- /dev/null +++ b/releng/fixtures/filesystems.json @@ -0,0 +1,23 @@ +[ + { + "pk": 1, + "model": "releng.filesystem", + "fields": { + "name": "autoprepare" + } + }, + { + "pk": 2, + "model": "releng.filesystem", + "fields": { + "name": "manual" + } + }, + { + "pk": 3, + "model": "releng.filesystem", + "fields": { + "name": "from config file" + } + } +] |