Merge branch 'dev/perf' of ssh://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab into dev/perf
Conflicts:
plugins/libkolab/SQL/mysql/2018122700.sql
plugins/libkolab/SQL/oracle/2018122700.sql
Merge branch 'dev/perf' of ssh://git.kolab.org/diffusion/RPK/roundcubemail…
Tags None Referenced Files None Subscribers None
Description Merge branch 'dev/perf' of ssh://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab into dev/perf Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (170)
R14:5d560bf4cd77 |