projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16d6d63 f8b7335)
Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 12:34:34 +0000 (12:34 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 12:34:34 +0000 (12:34 +0000)
1  2 
kronolith/js/kronolith.js patch | diff1 | diff2 | blob | history

diff --cc kronolith/js/kronolith.js
Simple merge
Unnamed repository; edit this file to name it for gitweb.