datatracker/hold-for-merge
Henrik Levkowetz 9688749404 Merged in [10109] from rjsparks@nostrum.com:
Make it clearer in search results when one IPR disclosure updates another. Fixes #1798.
 - Legacy-Id: 10117
Note: SVN reference [10109] has been migrated to Git commit a6b8707030f0e6411b1acc3b38a0fd426c5223a1
2015-10-01 20:26:23 +00:00

25 lines
1.5 KiB
Plaintext

# -*- conf-mode -*-
branch/iola/docalias-primary-key-r10101 @ 10111
branch/amsl/liaisons/6.4.1 @ 10098
personal/lars/6.2.1.dev0@9970 # Requires the timeline work
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge
personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in
personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in
personal/lars/6.0.5.dev0@9729 # Jquery update; wait with this to the CDN branch comes in
personal/rjs/v6.0.4.dev0@9647 # Commit contained too much. Later corrected commit will be marked for merge
personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in
personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead
personal/liudapeng/v5.5.1-dev0@7925 # alternative resolution desired
personal/rjs/v5.2.0@7544
personal/liudapeng/v5.0.2@7399
personal/rcross/v5.4.1@7771 # Already fixed in [7664], in a slightly more future-safe way
personal/liudapeng/v5.6.2-dev0@8129
personal/sunqi/v5.6.2-dev0@8147 # inapplicable due to edits of prior merge.
personal/liudapeng/v5.6.2-dev0@8148 # needs more work
personal/liudapeng/v5.6.2-dev0@8149 # needs more work
personal/chengang/v5.6.1-dev0@8152 # already fixed earlier
personal/rcross/v5.6.2-dev0@8156 # re-work to use a flag on the meeting model instead of lock file