Merge branch 'add-1024-week-offset' into fp-integration

author Frédéric Perrin <fred@fperrin.net>

Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)

committer Frédéric Perrin <fred@fperrin.net>

Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)
author Frédéric Perrin <fred@fperrin.net>
Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)
committer Frédéric Perrin <fred@fperrin.net>
Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)
diff --cc src/tim/prune/lang/prune-texts_en.properties
Simple merge
author	Frédéric Perrin <fred@fperrin.net>
	Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)
committer	Frédéric Perrin <fred@fperrin.net>
	Sun, 5 Jan 2020 14:40:47 +0000 (14:40 +0000)