Merge branch 'kolab/integration/4.13.0' into kolab/integration/4.14.3
Conflicts:
CMakeLists.txt
src/xapian/xapiandatabase.cpp
Description
Description
Details
Details
- Provenance
Christian Mollekopf <chrigi_1@fastmail.fm> Authored on Jun 20 2017, 3:52 PM mollekopf Pushed on Jun 20 2017, 3:52 PM - Parents
- rKB7ad6f088e4ab: Prepared release
rKB0ea73ccd4bb4: Prepare release of 4.14.3.1 - Branches
- Unknown
- Tags
- References
- tag: baloo-4.14.3.2, tag: baloo-4.13.3.2
Merged Changes
Merged Changes