projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b0d322e
81659b1
)
Merged from 5.2: a few fixes
author
Roland Mas
<lolando@debian.org>
Thu, 18 Oct 2012 13:44:34 +0000
(15:44 +0200)
committer
Roland Mas
<lolando@debian.org>
Thu, 18 Oct 2012 13:44:34 +0000
(15:44 +0200)
1
2
src/plugins/mediawiki/www/plugin_admin.php
patch
|
diff1
|
diff2
|
blob
|
history
src/www/admin/index.php
patch
|
diff1
|
diff2
|
blob
|
history
src/www/include/features_boxes.php
patch
|
diff1
|
diff2
|
blob
|
history
src/www/themes/css/fusionforge.css
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/mediawiki/www/plugin_admin.php
Simple merge
diff --cc
src/www/admin/index.php
index c5c7f9a1ef732402b74fddff41c4470f02e501a1,d2e0668f74c1955622326821632ff0888343fa2e..720103d095336800f00d794ffba64a819af0d0af
---
1
/
src/www/admin/index.php
---
2
/
src/www/admin/index.php
+++ b/
src/www/admin/index.php
@@@
-30,8
-30,9
+30,9
@@@
*/
-require_once
('../env.inc.php')
;
+require_once
'../env.inc.php'
;
require_once $gfcommon.'include/pre.php';
+ require_once $gfcommon.'include/FusionForge.class.php';
require_once $gfwww.'admin/admin_utils.php';
require_once $gfwww.'include/role_utils.php';
diff --cc
src/www/include/features_boxes.php
Simple merge
diff --cc
src/www/themes/css/fusionforge.css
Simple merge