From f71307f87e60960e8fc59cb489b748ca3fffe129 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Thu, 6 Mar 2014 11:00:00 -0800 Subject: [PATCH] changelog for #570 --- docs/changelog.rst | 2 ++ docs/reference/config.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4b1300ebb..5e0411da8 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -25,6 +25,8 @@ Fixes: Thanks to Pedro Silva. * :doc:`/plugins/duplicates`: Fix checksumming command execution for files with quotation marks in their names. Thanks again to Pedro Silva. +* Fix a crash when importing with both of the :ref:`group_albums` and + :ref:`incremental` options enabled. Thanks to geigerzaehler. 1.3.3 (February 26, 2014) diff --git a/docs/reference/config.rst b/docs/reference/config.rst index a589a17f3..79e0c5da3 100644 --- a/docs/reference/config.rst +++ b/docs/reference/config.rst @@ -290,6 +290,8 @@ means that the user should be prompted when resuming is possible. The ``-p`` and ``-P`` flags correspond to the "yes" and "no" settings and override this option. +.. _incremental: + incremental ~~~~~~~~~~~