summaryrefslogtreecommitdiff
path: root/main/fixtures
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-02-28 21:05:13 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-02-28 21:05:13 -0500
commit9e90f1968802d350157bcbeef0cebd7d96eb1ada (patch)
tree1153f677b807c9d7f40ef2ce4f9ab692ac6979a0 /main/fixtures
parent60f9b3fe60d5e5b6049ef71d1dfb25dade4fd6a3 (diff)
parent20e9a83e05e352ec6e6f8fbe70457951cf9cd047 (diff)
Merge commit '20e9a83' from Archweb
Conflicts: main/fixtures/groups.json packages/templatetags/package_extras.py
Diffstat (limited to 'main/fixtures')
-rw-r--r--main/fixtures/groups.json50
1 files changed, 50 insertions, 0 deletions
diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index 385e321d..0a3c966c 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -34,6 +34,36 @@
"delete_todolistpkg",
"main",
"todolistpkg"
+ ],
+ [
+ "add_news",
+ "news",
+ "news"
+ ],
+ [
+ "change_news",
+ "news",
+ "news"
+ ],
+ [
+ "add_signoff",
+ "packages",
+ "signoff"
+ ],
+ [
+ "change_signoff",
+ "packages",
+ "signoff"
+ ],
+ [
+ "add_signoffspecification",
+ "packages",
+ "signoffspecification"
+ ],
+ [
+ "change_signoffspecification",
+ "packages",
+ "signoffspecification"
]
]
}
@@ -350,6 +380,26 @@
"delete_todolistpkg",
"main",
"todolistpkg"
+ ],
+ [
+ "add_signoff",
+ "packages",
+ "signoff"
+ ],
+ [
+ "change_signoff",
+ "packages",
+ "signoff"
+ ],
+ [
+ "add_signoffspecification",
+ "packages",
+ "signoffspecification"
+ ],
+ [
+ "change_signoffspecification",
+ "packages",
+ "signoffspecification"
]
]
}