Age | Commit message (Collapse) | Author |
|
Conflicts:
CHANGELOG
|
|
|
|
- remove ambiguous m/d/Y format from default config
Conflicts:
CHANGELOG
config/main.inc.php.dist
program/lib/Roundcube/rcube_utils.php
tests/Framework/Utils.php
|
|
- reverted commit 856ec447fa0a7ddd0ad19ed57fc0031040037284 which shouldn't
be cherry-picked from master
|
|
|
|
Conflicts:
CHANGELOG
program/lib/Roundcube/bootstrap.php
|
|
|
|
Conflicts:
CHANGELOG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
release-0.9
|
|
|
|
|
|
Conflicts:
CHANGELOG
|
|
|
|
Conflicts:
CHANGELOG
tests/Framework/StringReplacer.php
|
|
Conflicts:
CHANGELOG
|
|
s/RGB/sRGB/
|
|
a message when using "edit as new"
|
|
|
|
added HTML content "washing"
Conflicts:
CHANGELOG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
users mailing list
|
|
|
|
draft (#1489229)
Conflicts:
program/js/app.js
|
|
Conflicts:
CHANGELOG
|
|
Conflicts:
CHANGELOG
|
|
|
|
|
|
(#1489214)
Conflicts:
CHANGELOG
program/steps/mail/compose.inc
|
|
|
|
Conflicts:
program/lib/Roundcube/rcube_imap_generic.php
|
|
|
|
(#1489216)
Conflicts:
CHANGELOG
|
|
"Sent date"
|