From 681807528ea992a3b3877db77449ac1c967b41a5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 23 Oct 2015 19:14:35 +0000 Subject: [PATCH] Updated merge lists. - Legacy-Id: 10274 --- hold-for-merge | 2 ++ ready-for-merge | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hold-for-merge b/hold-for-merge index 4aa1fbec7..9e3248fd6 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,7 @@ # -*- conf-mode -*- +branch/iola/event-saving-refactor-r10076 @ 10190 + branch/amsl/liaisons@10160 # Merged as branch/amsl/liaisons/6.4.1 @ 10160 personal/lars/6.2.1.dev0@9970 # Requires the timeline work personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach' diff --git a/ready-for-merge b/ready-for-merge index 87019bb6b..aed7f3101 100644 --- a/ready-for-merge +++ b/ready-for-merge @@ -7,7 +7,7 @@ # --- Add entries at the top --- -branch/iola/event-saving-refactor-r10076 @ 10190 + branch/iola/automatic-doc-name-search-r10126 @ 10158 branch/iola/docalias-primary-key-r10101 @ 10111 branch/amsl/liaisons/6.4.1 @ 10098