# -*- conf-mode -*-

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