projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
636a9ac
)
Added missing includes
author
Roland Mas
<lolando@debian.org>
Wed, 10 Feb 2010 17:25:53 +0000
(17:25 +0000)
committer
Roland Mas
<lolando@debian.org>
Wed, 10 Feb 2010 17:25:53 +0000
(17:25 +0000)
gforge/www/project/admin/index.php
patch
|
blob
|
history
diff --git
a/gforge/www/project/admin/index.php
b/gforge/www/project/admin/index.php
index f218b4fdaba02ee1d0e713d7d3587dc22819da32..ba0eb2f2f239d6d82f775fd8a04e0bfbe19d7b62 100644
(file)
--- a/
gforge/www/project/admin/index.php
+++ b/
gforge/www/project/admin/index.php
@@
-29,8
+29,9
@@
require_once('../../env.inc.php');
require_once $gfwww.'include/pre.php';
+require_once $gfwww.'include/role_utils.php';
require_once $gfwww.'project/admin/project_admin_utils.php';
-
+require_once $gfcommon.'include/GroupJoinRequest.class.php';
$group_id = getIntFromRequest('group_id');
session_require(array('group'=>$group_id,'admin_flags'=>'A'));
@@
-392,7
+393,6
@@
echo $HTML->boxBottom();?>
</tr>
</table>
->>>>>>> MERGE-SOURCE
<?php