summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-25 11:25:14 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-25 11:25:14 +0100
commit5352b55779aadc8b4c665daf69c7a27767f17d78 (patch)
tree07b1dbe580b644d2578071956349bffac63b6b4c /plugins
parent297c1afb80bc73e595a6dad42adcd536cf947ea8 (diff)
parent65dff8f812cc6b0c4fdd470905700143910289b2 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts: CHANGELOG
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions