summaryrefslogtreecommitdiff
path: root/program/lib/encoding
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-10-25 16:50:25 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-10-25 16:50:25 +0200
commit98b7b548a229600f7653cd67d9aae43675938143 (patch)
tree15c141db332b9ae87ef3fbf573ea32d30dc1ea76 /program/lib/encoding
parent4e4c2511bc00cfc0214acab63b097efe142187a7 (diff)
parent9c41ba3c9ebbb14d01abe961c420f71f9463e61a (diff)
Merge branch 'dev-canned-responses'
Conflicts (resolved): skins/classic/includes/settingstabs.html skins/larry/includes/settingstabs.html
Diffstat (limited to 'program/lib/encoding')
0 files changed, 0 insertions, 0 deletions