Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
| Cyrill von Wattenwyl | Authored on Sep 2 2014, 9:20 AM |
| mollekopf | Pushed on Aug 21 2023, 3:06 PM |