datatracker/hold-for-merge
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com:
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
2015-07-18 09:18:54 +00:00

21 lines
1.3 KiB
Plaintext

# -*- conf-mode -*-
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