diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-12-15 10:02:20 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-12-15 10:02:20 +0100 |
| commit | acfbe5ff4c71bf6cd9d5fda27eb93406f140b23f (patch) | |
| tree | 5ee176e0739f5418853e4e6a378e29d9b91cde22 /plugins/userinfo | |
| parent | 9a0153324eeb1f0e808cb1a063d1f37d49ad48e2 (diff) | |
| parent | 2dade15d83b9d0b105fcb35c9edd62bfeceece16 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts:
CHANGELOG
Diffstat (limited to 'plugins/userinfo')
0 files changed, 0 insertions, 0 deletions