Skip to content

Commit 6818075

Browse files
committed
Updated merge lists.
- Legacy-Id: 10274
1 parent 7accc69 commit 6818075

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

hold-for-merge

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- conf-mode -*-
22

3+
branch/iola/event-saving-refactor-r10076 @ 10190
4+
35
branch/amsl/liaisons@10160 # Merged as branch/amsl/liaisons/6.4.1 @ 10160
46
personal/lars/6.2.1.dev0@9970 # Requires the timeline work
57
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'

ready-for-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# --- Add entries at the top ---
99

10-
branch/iola/event-saving-refactor-r10076 @ 10190
10+
1111
branch/iola/automatic-doc-name-search-r10126 @ 10158
1212
branch/iola/docalias-primary-key-r10101 @ 10111
1313
branch/amsl/liaisons/6.4.1 @ 10098

0 commit comments

Comments
 (0)