summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-29 08:34:31 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-29 08:34:31 +0200
commit0062becea70392c4a21f3ef8367f65e93d2c1f67 (patch)
tree93595c3a8f765124d9674da8a9623186dddaf874 /program/js
parent46d0012e26d18b1a780ff71cd8aa2f04e6c4a11b (diff)
parentb7d33e35186d47dcd3609e1ef97cdb011c6f82f6 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts: CHANGELOG
Diffstat (limited to 'program/js')
0 files changed, 0 insertions, 0 deletions