Merge branch 'master' into delete-own-comments

Conflicts: CHANGES.rst
2015-01-29 21:14:05 +01:00
parent 06b20b8f81 0591f9ad2d
commit c852609111
20 changed files with 355 additions and 237 deletions
@@ -3,12 +3,12 @@
    <permissions>
        <permission name="Review comments" acquire="True">
            <role name="Manager"/>
-	        <role name="Site Administrator"/>
+            <role name="Site Administrator"/>
            <role name="Reviewer"/>
        </permission>
        <permission name="Edit comments" acquire="True">
            <role name="Manager"/>
-	        <role name="Site Administrator"/>
+            <role name="Site Administrator"/>
            <role name="Reviewer"/>
            <role name="Owner"/>
        </permission>