Merge branch 'master' of git.0x2620.org:/pandora_mdr

This commit is contained in:
Rolux 2015-09-21 20:10:37 +01:00
commit d0769bafaf
2 changed files with 10 additions and 0 deletions

View file

@ -671,6 +671,8 @@
"id": "keywords",
"title": "Keywords",
"canAddAnnotations": {"member": true, "staff": true, "admin": true},
"hasEvents": true,
"hasPlaces": true,
"item": "Keyword",
"autocomplete": true,
"overlap": true,
@ -680,6 +682,8 @@
"id": "notes",
"title": "Notes",
"canAddAnnotations": {"member": true, "friend": true, "staff": true, "admin": true},
"hasEvents": true,
"hasPlaces": true,
"item": "Note",
"overlap": true,
"showInfo": true,