projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd7c902
986e3ad
)
Merge branch 'Branch_5_2'
author
Thorsten Glaser
<t.glaser@tarent.de>
Thu, 23 May 2013 10:40:59 +0000
(12:40 +0200)
committer
Thorsten Glaser
<t.glaser@tarent.de>
Thu, 23 May 2013 10:40:59 +0000
(12:40 +0200)
Conflicts:
src/deb-specific/create-mailing-lists.pl
1
2
src/common/widget/Widget_MyAdmin.class.php
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/mediawiki/www/LocalSettings.php
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/scmbzr/common/BzrPlugin.class.php
patch
|
diff1
|
diff2
|
blob
|
history
src/www/admin/index.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/common/widget/Widget_MyAdmin.class.php
Simple merge
diff --cc
src/plugins/mediawiki/www/LocalSettings.php
Simple merge
diff --cc
src/plugins/scmbzr/common/BzrPlugin.class.php
Simple merge
diff --cc
src/www/admin/index.php
Simple merge