]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 28 Dec 2010 19:37:38 +0000 (11:37 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 28 Dec 2010 19:37:38 +0000 (11:37 -0800)
1  2 
actions/newgroup.php
classes/Profile.php
classes/User_group.php
lib/right.php

Simple merge
Simple merge
Simple merge
diff --cc lib/right.php
index 5bf9c41161adf86972068d7ab8196975b9dac6a8,ccabd00c92061925a36d427a80b9988eeb19aef3..d144b21ae98469595f24c84ffc8dff47ae9e66f3
@@@ -61,9 -61,6 +61,10 @@@ class Righ
      const GRANTROLE          = 'grantrole';
      const REVOKEROLE         = 'revokerole';
      const DELETEGROUP        = 'deletegroup';
 +    const BACKUPACCOUNT      = 'backupaccount';
 +    const RESTOREACCOUNT     = 'restoreaccount';
 +    const DELETEACCOUNT      = 'deleteaccount';
 +    const MOVEACCOUNT        = 'moveaccount';
+     const CREATEGROUP        = 'creategroup';
  }