projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 106c289 ccfe171)
Merge branch 'horde-upstream'
authorJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:11:18 +0000 (18:11 +0100)
committerJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:11:18 +0000 (18:11 +0100)
1  2 
framework/Core/lib/Horde/Registry.php patch | diff1 | diff2 | blob | history
kronolith/templates/index/index.inc patch | diff1 | diff2 | blob | history

diff --cc framework/Core/lib/Horde/Registry.php
Simple merge
diff --cc kronolith/templates/index/index.inc
Simple merge
Unnamed repository; edit this file to name it for gitweb.